From ff387c744941f466f1dc8cca30aa2a27b1d441f0 Mon Sep 17 00:00:00 2001
From: Xavier Beaudouin <kiwi@pkg2.home.oav.net>
Date: Tue, 3 Sep 2024 14:24:55 +0200
Subject: [PATCH] Update poudriere

---
 portshaker/portshaker.d/freebsd            |  4 +++-
 poudriere/poudriere.d/130x64.list          |  1 +
 poudriere/poudriere.d/140x64.list          |  5 +++++
 poudriere/poudriere.d/verisign13-make.conf |  1 +
 poudriere/poudriere.d/verisign13.list      | 15 ++++++++-------
 root/poudriere-build.sh                    |  6 +++---
 root/poudriere-pkgclean.sh                 |  8 ++++----
 root/poudriere-portsnap.sh                 |  2 ++
 8 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/portshaker/portshaker.d/freebsd b/portshaker/portshaker.d/freebsd
index 6f89080..2cb4f00 100755
--- a/portshaker/portshaker.d/freebsd
+++ b/portshaker/portshaker.d/freebsd
@@ -4,5 +4,7 @@ if [ "$1" != '--' ]; then
   err 1 "Extra arguments"
 fi
 shift
-method="portsnap"
+method="git"
+git_clone_uri="https://git.freebsd.org/ports.git"
+git_branch=main
 run_portshaker_command $*
diff --git a/poudriere/poudriere.d/130x64.list b/poudriere/poudriere.d/130x64.list
index dab9774..ceb37f1 100644
--- a/poudriere/poudriere.d/130x64.list
+++ b/poudriere/poudriere.d/130x64.list
@@ -217,3 +217,4 @@ sysutils/lsof
 #net/xmlrpc-c
 #net/freeipa-client
 databases/ldb25
+graphics/drm-kmod
diff --git a/poudriere/poudriere.d/140x64.list b/poudriere/poudriere.d/140x64.list
index a0f7cd3..1e7561f 100644
--- a/poudriere/poudriere.d/140x64.list
+++ b/poudriere/poudriere.d/140x64.list
@@ -38,6 +38,7 @@ sysutils/monit
 math/mpdecimal
 net-mgmt/nagios-plugins
 www/nginx
+www/freenginx
 sysutils/node_exporter
 net-mgmt/nrpe
 devel/oniguruma
@@ -216,3 +217,7 @@ sysutils/lsof
 #net/xmlrpc-c
 #net/freeipa-client
 misc/py-jsonargparse
+www/joomla5
+graphics/drm-kmod
+www/yarn
+textproc/hs-pandoc
diff --git a/poudriere/poudriere.d/verisign13-make.conf b/poudriere/poudriere.d/verisign13-make.conf
index 4f86aa5..e61c5bb 100644
--- a/poudriere/poudriere.d/verisign13-make.conf
+++ b/poudriere/poudriere.d/verisign13-make.conf
@@ -13,6 +13,7 @@ VALID_CATEGORIES+=local
 BUILD_ALL_PYTHON_FLAVORS=yes
 
 #DEFAULT_VERSIONS+= samba=4.13
+DEFAULT_VERSIONS+= samba=4.19
 
 .if ${.CURDIR:M*/ftp/curl}
 OPTIONS_FILE_UNSET+=GSSAPI_BASE
diff --git a/poudriere/poudriere.d/verisign13.list b/poudriere/poudriere.d/verisign13.list
index 83d5bce..9a4fa2c 100644
--- a/poudriere/poudriere.d/verisign13.list
+++ b/poudriere/poudriere.d/verisign13.list
@@ -85,15 +85,15 @@ archivers/rpm4
 sysutils/ansible
 devel/subversion
 net/quagga
-net/bird
-net/bird@ipv6
+#net/bird
+#net/bird@ipv6
 net-mgmt/lldpd
 net-mgmt/openlldp
 devel/py-ipaddr
 net/py-netifaces
 #security/sssd
-#security/sssd2
-security/sssd2-klara
+security/sssd2
+#security/sssd2-klara
 security/openssl
 security/krb5
 security/cyrus-sasl2-gssapi
@@ -127,7 +127,7 @@ devel/pkgconf
 net/xmlrpc-c
 devel/patch
 ports-mgmt/dialog4ports
-devel/py-yaml
+devel/py-pyyaml
 benchmarks/bonnie
 benchmarks/bonnie++
 benchmarks/iozone
@@ -152,10 +152,10 @@ security/py-gssapi
 sysutils/py-salt
 dns/powerdns
 net-mgmt/adcli
-sysutils/devcpu-data
+sysutils/cpu-microcode
 net-mgmt/telegraf
 sysutils/rsyslog8
-security/bcrypt
+#security/bcrypt
 sysutils/x86info
 textproc/py-toml
 textproc/py-tomlkit
@@ -169,3 +169,4 @@ security/tpm-tools
 security/tpm2-tools
 security/tpm2-abrmd
 security/tpm-quote-tools
+net/samba419
diff --git a/root/poudriere-build.sh b/root/poudriere-build.sh
index 3141cd1..dd67019 100755
--- a/root/poudriere-build.sh
+++ b/root/poudriere-build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/140x64.list -j 140x64 -p default
-/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/141x64.list -j 141x64 -p default
-/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/verisign13.list -j verisign13 -p klara
+#/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/140x64.list -j 140x64 -p default -O kiwi_ports
+/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/141x64.list -j 141x64 -p default -O kiwi_ports
+/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/verisign13.list -j verisign13 -p default -O klara_ports
 #/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/130x64.list -j 130x64 -p default
 #/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/120x64.list -j 120x64 -p default
 
diff --git a/root/poudriere-pkgclean.sh b/root/poudriere-pkgclean.sh
index 72a367f..32a595a 100755
--- a/root/poudriere-pkgclean.sh
+++ b/root/poudriere-pkgclean.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/130x64.list -j 130x64 -p default -y
-/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/140x64.list -j 140x64 -p default -y
-/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/141x64.list -j 141x64 -p default -y
-/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/verisign13.list -j verisign13 -p klara -y
+/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/130x64.list -j 130x64 -p default -y -O kiwi_ports
+/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/140x64.list -j 140x64 -p default -y -O kiwi_ports
+/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/141x64.list -j 141x64 -p default -y -O kiwi_ports
+/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/verisign13.list -j verisign13 -p default -y -O klara_ports
 /usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/verisign13.list -j verisign13 -p default -y
diff --git a/root/poudriere-portsnap.sh b/root/poudriere-portsnap.sh
index 744eac2..ade3987 100755
--- a/root/poudriere-portsnap.sh
+++ b/root/poudriere-portsnap.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 /usr/local/bin/poudriere ports -u
+/usr/local/bin/poudriere ports -u -p kiwi_ports
+/usr/local/bin/poudriere ports -u -p klara_ports
 /usr/local/bin/poudriere ports -l