From 2e7841c5cdb81042d54bcbeb0df3315030ebc5a0 Mon Sep 17 00:00:00 2001
From: Xavier Beaudouin <kiwi@pkg2.home.oav.net>
Date: Wed, 18 Dec 2024 10:54:46 +0100
Subject: [PATCH] Update Verisign stuff

---
 poudriere/poudriere.d/verisign13-make.conf | 36 +++++++++++-----------
 poudriere/poudriere.d/verisign13.list      |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/poudriere/poudriere.d/verisign13-make.conf b/poudriere/poudriere.d/verisign13-make.conf
index e61c5bb..45b8994 100644
--- a/poudriere/poudriere.d/verisign13-make.conf
+++ b/poudriere/poudriere.d/verisign13-make.conf
@@ -38,22 +38,22 @@ OPTIONS_FILE_SET+=NLS
 OPTIONS_FILE_UNSET+=NOARGS_SHELL
 OPTIONS_FILE_UNSET+=OPIE
 OPTIONS_FILE_SET+=PAM
-OPTIONS_FILE_UNSET+=SSSD
-OPTIONS_FILE_SET+=SSSD2
+#OPTIONS_FILE_UNSET+=SSSD
+#OPTIONS_FILE_SET+=SSSD2
 OPTIONS_FILE_UNSET+=GSSAPI_BASE
 OPTIONS_FILE_UNSET+=GSSAPI_HEIMDAL
 OPTIONS_FILE_UNSET+=GSSAPI_MIT
 .endif
 
-.if ${.CURDIR:M*/databases/ldb2*}
-OPTIONS_FILE_SET+=PYTHON3
-.endif
+#.if ${.CURDIR:M*/databases/ldb2*}
+#PTIONS_FILE_SET+=PYTHON3
+#.endif
 
-.if ${.CURDIR:M*/net/samba4*}
-OPTIONS_FILE_UNSET+=AD_DC
-OPTIONS_FILE_UNSET+=QUOTAS
-SAMBA4_BUNDLED_LDB=no
-.endif
+#.if ${.CURDIR:M*/net/samba4*}
+#OPTIONS_FILE_UNSET+=AD_DC
+#OPTIONS_FILE_UNSET+=QUOTAS
+#SAMBA4_BUNDLED_LDB=no
+#.endif
 
 .if ${.CURDIR:M*/java/openjdk*}
 OPTIONS_FILE_UNSET+=X11
@@ -81,15 +81,15 @@ OPTIONS_FILE_UNSET+=HEIMDAL
 OPTIONS_FILE_UNSET+=HEIMDAL_BASE
 .endif
 
-.if ${.CURDIR:M*/net-mgmt/nrpe}
-OPTIONS_FILE_UNSET+=NAGPLUGINS
-OPTIONS_FILE_SET+=MONPLUGINS
-.endif
+#.if ${.CURDIR:M*/net-mgmt/nrpe}
+#OPTIONS_FILE_UNSET+=NAGPLUGINS
+#OPTIONS_FILE_SET+=MONPLUGINS
+#.endif
 
-.if ${.CURDIR:M*/net-mgmt/nagios}
-OPTIONS_FILE_UNSET+=MONPLUGINS
-OPTIONS_FILE_SET+=NAGPLUGINS
-.endif
+#.if ${.CURDIR:M*/net-mgmt/nagios}
+#OPTIONS_FILE_UNSET+=MONPLUGINS
+#OPTIONS_FILE_SET+=NAGPLUGINS
+#.endif
 
 .if ${.CURDIR:M*/security/cyrus-sasl2-gssapi}
 OPTIONS_FILE_UNSET+=GSSAPI_BASE
diff --git a/poudriere/poudriere.d/verisign13.list b/poudriere/poudriere.d/verisign13.list
index 1b71bbf..1c582b4 100644
--- a/poudriere/poudriere.d/verisign13.list
+++ b/poudriere/poudriere.d/verisign13.list
@@ -75,14 +75,14 @@ net/py-oauth
 net/py-oauth2
 comms/py-pyserial
 devel/py-configobj
-devel/py-yaml
+devel/py-pyyaml
 devel/py-argparse
 www/py-requests
 devel/py-six
 devel/py-boto
 sysutils/gpart
 net/cloud-init
-sysutils/e2fsprogs
+filesystems/e2fsprogs
 archivers/rpm4
 sysutils/ansible
 devel/subversion