From fc56fed1aca5e20a2272e7e308a3b36fdebc1a27 Mon Sep 17 00:00:00 2001 From: Cullum Smith Date: Thu, 21 Nov 2024 20:35:37 -0500 Subject: misc fixes --- .../postgresql16-gssapi.patch.pkg_repository | 14 +++-- .../local/etc/poudriere.d/pkglist.pkg_repository | 1 + scripts/hostclass/pkg_repository | 2 +- scripts/os/freebsd/20-termcap | 62 ---------------------- scripts/os/freebsd/43-termcap | 5 ++ 5 files changed, 13 insertions(+), 71 deletions(-) delete mode 100644 scripts/os/freebsd/20-termcap create mode 100644 scripts/os/freebsd/43-termcap 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 diff --git a/scripts/hostclass/pkg_repository b/scripts/hostclass/pkg_repository index 800faae..9a3d448 100644 --- a/scripts/hostclass/pkg_repository +++ b/scripts/hostclass/pkg_repository @@ -5,7 +5,7 @@ : ${poudriere_dataset:="${state_dataset:-zroot}"} : ${poudriere_make_jobs_number:='8'} : ${poudriere_priority_boost:='gcc* llvm* rust'} -: ${poudriere_allow_make_jobs_packages:='ImageMagick* bitwarden-cli cargo-c *chromium* cmake cmake-core eclipse electron* ffmpeg firefox thunderbird gcc* gnutls gtk3* icu libreoffice* llvm* mongodb* mysql*-client mysql*-server node* openjdk* openssl pkg qt*-webengine rust webkit* vaultwarden'} +: ${poudriere_allow_make_jobs_packages:='ImageMagick* bitwarden-cli cargo-c *chromium* cmake cmake-core eclipse electron* ffmpeg firefox thunderbird gcc* gnutls gtk3* icu libreoffice* llvm* mongodb* mysql*-client mysql*-server node* openjdk* openssl pkg postgresql* qt*-webengine rust webkit* vaultwarden'} : ${poudriere_ccache_size:='50.0G'} : ${poudriere_default_versions:='imagemagick=7-nox11'} diff --git a/scripts/os/freebsd/20-termcap b/scripts/os/freebsd/20-termcap deleted file mode 100644 index ff10d44..0000000 --- a/scripts/os/freebsd/20-termcap +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# Fix xterm-256color termcap -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280679 -mkdir -p /usr/local/share/site-terminfo -cat <<'EOF' | tic -o /usr/local/share/site-terminfo - -xterm-256color|xterm with 256 colors, - am, bce, ccc, km, mc5i, mir, msgr, npc, xenl, - colors#0x100, cols#80, it#8, lines#24, pairs#0x10000, - acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, - bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, - clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=\r, - csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, - cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, - cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, - cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, - dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, - el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, home=\E[H, - hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, - initc=\E]4;%p1%d;rgb:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, - invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kDC=\E[3;2~, - kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, - kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, ka1=\EOw, - ka3=\EOy, kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, - kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, - kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, - kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, - kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, - kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, - kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, - kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, - kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, - kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, - kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, - kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, - kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, - kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~, - kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, - kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, - kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, - kf8=\E[19~, kf9=\E[20~, khome=\EOH, kich1=\E[2~, - kind=\E[1;2B, kmous=\E[<, knp=\E[6~, kpp=\E[5~, - kri=\E[1;2A, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, - memu=\Em, mgc=\E[?69l, nel=\EE, oc=\E]104\007, - op=\E[39;49m, rc=\E8, rep=%p1%c\E[%p2%{1}%-%db, - rev=\E[7m, ri=\EM, rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, - rmam=\E[?7l, rmcup=\E[?1049l\E[23;0;0t, rmir=\E[4l, - rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, - rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, - setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, - setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, - sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, - sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, - smcup=\E[?1049h\E[22;0;0t, - smglr=\E[?69h\E[%i%p1%d;%p2%ds, smir=\E[4h, - smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m, smul=\E[4m, - tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, - u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd, -EOF diff --git a/scripts/os/freebsd/43-termcap b/scripts/os/freebsd/43-termcap new file mode 100644 index 0000000..ad2a627 --- /dev/null +++ b/scripts/os/freebsd/43-termcap @@ -0,0 +1,5 @@ +#!/bin/sh + +# Fix xterm-256color termcap +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280679 +pkg install terminfo-db -- cgit v1.2.3 From fd48cf208a223ea58464715761e42cfd73c99112 Mon Sep 17 00:00:00 2001 From: Cullum Smith Date: Thu, 21 Nov 2024 20:59:10 -0500 Subject: move modules from loader.conf to rc.conf --- scripts/hostclass/desktop | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/hostclass/desktop b/scripts/hostclass/desktop index 79b40f2..e5a8a29 100644 --- a/scripts/hostclass/desktop +++ b/scripts/hostclass/desktop @@ -22,13 +22,10 @@ EOF fi # Load linux kernel modules. -load_kernel_module linux linux64 -set_loader_conf \ - linux_load=YES \ - linux64_load=YES +sysrc -v linux_enable=YES # Enable FUSE. -set_loader_conf fusefs_load=YES +sysrc -v kld_list+=fusefs # Install packages common to all DEs. pkg install -y $desktop_common_packages -- cgit v1.2.3 From 2e134967f1d4368ad37eeee676eadd536d916d10 Mon Sep 17 00:00:00 2001 From: Cullum Smith Date: Thu, 21 Nov 2024 21:05:18 -0500 Subject: remove cuse from loader.conf --- scripts/hostclass/desktop | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/hostclass/desktop b/scripts/hostclass/desktop index e5a8a29..381aeef 100644 --- a/scripts/hostclass/desktop +++ b/scripts/hostclass/desktop @@ -55,8 +55,6 @@ sysrc -v "devfs_system_ruleset=${devfs_local_ruleset_name}" service devfs restart # Enable webcamd. -load_kernel_module cuse -set_loader_conf cuse_load=YES sysrc -v webcamd_enable=YES service webcamd status || service webcamd start -- cgit v1.2.3