From 8f813946fc7eab05eb1cc9c128c0904a0de50ccc Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Mon, 5 May 2025 15:22:38 +0200 Subject: [PATCH] Fix --- poudriere/poudriere.d/140x64.list | 8 +- poudriere/poudriere.d/142x64-make.conf | 10 +- poudriere/poudriere.d/142x64.list | 3 + poudriere/poudriere.d/klara.list | 2 +- poudriere/poudriere.d/verisign13-make.conf | 4 - poudriere/poudriere.d/verisign13.list | 344 ++++++++++----------- root/poudriere-build.sh | 4 +- root/poudriere-portsnap.sh | 1 + 8 files changed, 189 insertions(+), 187 deletions(-) diff --git a/poudriere/poudriere.d/140x64.list b/poudriere/poudriere.d/140x64.list index c299523..70bb98a 100644 --- a/poudriere/poudriere.d/140x64.list +++ b/poudriere/poudriere.d/140x64.list @@ -81,6 +81,7 @@ graphics/png mail/postfix lang/python3 lang/python39 +lang/python312 devel/readline databases/redis sysutils/screen @@ -220,15 +221,14 @@ graphics/drm-kmod www/yarn textproc/hs-pandoc emulators/qemu@nox11 -# Webmail -www/sogo-activesync # puppet sysutils/puppet8 sysutils/puppetserver8 www/trafficserver -www/py-homeassistant +#www/py-homeassistant net/gitup misc/ollama emulators/libc6-shim sysutils/pv - +mail/imapsync +comms/iwmbt-firmware diff --git a/poudriere/poudriere.d/142x64-make.conf b/poudriere/poudriere.d/142x64-make.conf index 26f4e65..393ef34 100644 --- a/poudriere/poudriere.d/142x64-make.conf +++ b/poudriere/poudriere.d/142x64-make.conf @@ -1,6 +1,6 @@ OPTIONS_UNSET+= X11 #DEFAULT_VERSIONS= php=8.2 mysql=10.6m java=11 pgsql=14 mono=6.8 -DEFAULT_VERSIONS= php=8.2 mysql=10.6m +DEFAULT_VERSIONS= mysql=10.6m #DISABLE_LICENSES=yes #LICENSES LICENSES_ACCEPTED+=3GPP @@ -119,9 +119,9 @@ CFLAGS+=-fno-omit-frame-pointer .endif # Sogo etc... -.if ${.CURDIR:M*/devel/sope} +#.if ${.CURDIR:M*/devel/sope} #OPTIONS_FILE_UNSET+=LDAP -OPTIONS_FILE_UNSET+=PGSQL -OPTIONS_FILE_SET+=MYSQL -.endif +#OPTIONS_FILE_UNSET+=PGSQL +#OPTIONS_FILE_SET+=MYSQL +#.endif diff --git a/poudriere/poudriere.d/142x64.list b/poudriere/poudriere.d/142x64.list index 3d9fafe..5aacc9c 100644 --- a/poudriere/poudriere.d/142x64.list +++ b/poudriere/poudriere.d/142x64.list @@ -104,6 +104,7 @@ graphics/png mail/postfix lang/python3 lang/python39 +lang/python312 devel/readline databases/redis sysutils/screen @@ -260,3 +261,5 @@ x11-fonts/linuxlibertine x11-fonts/linuxlibertine-g # TODO: www/py-homeassistant +mail/imapsync +comms/iwmbt-firmware diff --git a/poudriere/poudriere.d/klara.list b/poudriere/poudriere.d/klara.list index 8d99aae..daa595d 100644 --- a/poudriere/poudriere.d/klara.list +++ b/poudriere/poudriere.d/klara.list @@ -4,7 +4,7 @@ ports-mgmt/poudriere-devel #net-mgmt/netbox-agent #devel/etcd35 #www/py-frappe-bench -net/akhq sysutils/data-prepper +net/akhq #net/samba420 diff --git a/poudriere/poudriere.d/verisign13-make.conf b/poudriere/poudriere.d/verisign13-make.conf index 0d2d3c2..0147166 100644 --- a/poudriere/poudriere.d/verisign13-make.conf +++ b/poudriere/poudriere.d/verisign13-make.conf @@ -22,10 +22,6 @@ OPTIONS_FILE_UNSET+=GSSAPI_NONE OPTIONS_FILE_SET+=GSSAPI_MIT .endif -.if ${.CURDIR:M*/security/sssd} -OPTIONS_FILE_SET+=SMB -.endif - .if ${.CURDIR:M*/security/sudo} OPTIONS_FILE_SET+=AUDIT OPTIONS_FILE_UNSET+=DISABLE_AUTH diff --git a/poudriere/poudriere.d/verisign13.list b/poudriere/poudriere.d/verisign13.list index d65d4c6..42ee65d 100644 --- a/poudriere/poudriere.d/verisign13.list +++ b/poudriere/poudriere.d/verisign13.list @@ -1,177 +1,177 @@ -net/libzmq4 -net/py-netaddr -sysutils/lsof -shells/bash -shells/zsh -lang/python -lang/python3 +#net/libzmq4 +#et/py-netaddr +#sysutils/lsof +#shells/bash +#shells/zsh +#lang/python +#lang/python3 #lang/ruby30 # XXX: fixx -security/sudo -#security/sudo@sssd -sysutils/cdrtools -sysutils/dvd+rw-tools -sysutils/dmidecode -shells/ksh93 -net/rsync -security/gnupg -ftp/wget -misc/e2fsprogs-libuuid -sysutils/smartmontools -sysutils/bsdhwmon -sysutils/ipmitool -editors/vim -ftp/curl -textproc/augeas -sysutils/puppet7 -security/ca_root_nss -sysutils/rubygem-facter -devel/gettext -security/libassuan -devel/libevent -devel/libffi -security/libgcrypt -security/libgpg-error -converters/libiconv -dns/libidn -security/libksba -security/libmcrypt -textproc/libxml2 -textproc/libyaml -net-mgmt/monitoring-plugins -net-mgmt/nrpe -net-mgmt/nrpe@monplugins -security/p5-Crypt-CBC -security/p5-Crypt-DES -security/p5-Digest-HMAC -security/p5-Digest-SHA1 -devel/p5-Event-Lib -net-mgmt/p5-Net-SNMP -devel/pth -devel/ruby-gems -archivers/rubygem-bzip2-ruby -textproc/rubygem-ruby-augeas -sysutils/xmbmon -sysutils/screen -sysutils/stress -dns/bind-tools -lang/cython -devel/gmake -devel/makedepend -devel/valgrind -www/p5-libwww -security/pam_ldap -devel/cmake -devel/cmake-gui -devel/gccmakedep -devel/icmake -devel/git -#emulators/qemu -#emulators/qemu-devel -java/openjdk8 -java/openjdk11 -devel/py-Jinja2 -devel/py-prettytable -net/py-oauth -net/py-oauth2 -comms/py-pyserial -devel/py-configobj -devel/py-pyyaml -devel/py-argparse -www/py-requests -devel/py-six -devel/py-boto -sysutils/gpart +#security/sudo +security/sudo@sssd +#sysutils/cdrtools +#sysutils/dvd+rw-tools +#.sysutils/dmidecode +#shells/ksh93 +#net/rsync +#security/gnupg +#ftp/wget +#misc/e2fsprogs-libuuid +#sysutils/smartmontools +#sysutils/bsdhwmon +#sysutils/ipmitool +#editors/vim +#ftp/curl +#textproc/augeas +#sysutils/puppet7 +#security/ca_root_nss +#sysutils/rubygem-facter +#devel/gettext +#security/libassuan +#devel/libevent +#devel/libffi +#security/libgcrypt +#security/libgpg-error +#converters/libiconv +#dns/libidn +#security/libksba +#security/libmcrypt +#textproc/libxml2 +#textproc/libyaml +#net-mgmt/monitoring-plugins +#net-mgmt/nrpe +#net-mgmt/nrpe@monplugins +#security/p5-Crypt-CBC +#security/p5-Crypt-DES +#security/p5-Digest-HMAC +#security/p5-Digest-SHA1 +#devel/p5-Event-Lib +#net-mgmt/p5-Net-SNMP +#devel/pth +#devel/ruby-gems +#archivers/rubygem-bzip2-ruby +#textproc/rubygem-ruby-augeas +#sysutils/xmbmon +#sysutils/screen +#sysutils/stress +#dns/bind-tools +#lang/cython +#devel/gmake +#devel/makedepend +#devel/valgrind +#www/p5-libwww +#security/pam_ldap +#devel/cmake +#devel/cmake-gui +#devel/gccmakedep +#devel/icmake +#devel/git +##emulators/qemu +##emulators/qemu-devel +#java/openjdk8 +#java/openjdk11 +#devel/py-Jinja2 +#devel/py-prettytable +#net/py-oauth +#net/py-oauth2 +#comms/py-pyserial +#devel/py-configobj +#devel/py-pyyaml +#devel/py-argparse +#www/py-requests +#devel/py-six +#devel/py-boto +#sysutils/gpart net/cloud-init -filesystems/e2fsprogs -archivers/rpm4 -sysutils/ansible -devel/subversion -net/quagga -#net/bird -#net/bird@ipv6 -net-mgmt/lldpd -net-mgmt/openlldp -devel/py-ipaddr -net/py-netifaces +#filesystems/e2fsprogs +#archivers/rpm4 +#sysutils/ansible +#devel/subversion +#net/quagga +##net/bird +##net/bird@ipv6 +#net-mgmt/lldpd +#net-mgmt/openlldp +#devel/py-ipaddr +#net/py-netifaces #security/sssd -security/sssd2 +#security/sssd2 #security/sssd2-klara -security/openssl -security/krb5 -security/cyrus-sasl2-gssapi -net/openldap26-client -devel/pkgconf -net/svnup -security/pam_mkhomedir -security/openssh-portable -security/openssh-portable@gssapi -security/openssh-portable@hpn -www/apache24 -ports-mgmt/poudriere -ports-mgmt/poudriere-devel -devel/binutils -textproc/expat2 -devel/libvirt -sysutils/tmux -sysutils/tree -sysutils/grub2-bhyve -devel/gdb -net/ladvd -net-mgmt/cdpd -devel/autoconf -devel/automake -textproc/gnugrep -textproc/gsed -devel/gettext -devel/gettext-runtime -devel/ding-libs -devel/pkgconf -net/xmlrpc-c -devel/patch -ports-mgmt/dialog4ports -devel/py-pyyaml -benchmarks/bonnie -benchmarks/bonnie++ -benchmarks/iozone -devel/cvs -ports-mgmt/portlint -databases/py-sispy -devel/rubygem-gettext-setup -sysutils/dtrace-toolkit -net-mgmt/nagios-check_hdd_health -net-mgmt/nagios -net-mgmt/nagios@monplugins -sysutils/ezjail -devel/py-pip -sysutils/iocage -sysutils/bhyve-firmware -sysutils/vm-bhyve -devel/jenkins -benchmarks/sysbench -sysutils/firstboot-pkgs -sysutils/ec2-scripts -sysutils/iohyve -converters/unix2dos -security/py-gssapi -sysutils/py-salt -dns/powerdns -net-mgmt/adcli -sysutils/cpu-microcode -net-mgmt/telegraf -sysutils/rsyslog8 -#security/bcrypt -sysutils/x86info -textproc/py-toml -textproc/py-tomlkit -devel/git-lfs -sysutils/dnf -sysutils/libdnf -security/rkhunter -security/chkrootkit -security/trousers -security/tpm-tools -security/tpm2-tools -security/tpm2-abrmd -security/tpm-quote-tools -net/samba419 +#security/openssl +#security/krb5 +#security/cyrus-sasl2-gssapi +#net/openldap26-client +#devel/pkgconf +#net/svnup +#security/pam_mkhomedir +#security/openssh-portable +#security/openssh-portable@gssapi +#security/openssh-portable@hpn +#www/apache24 +#ports-mgmt/poudriere +#ports-mgmt/poudriere-devel +#devel/binutils +#textproc/expat2 +#devel/libvirt +#sysutils/tmux +#sysutils/tree +#sysutils/grub2-bhyve +#devel/gdb +#net/ladvd +#net-mgmt/cdpd +#devel/autoconf +#devel/automake +#textproc/gnugrep +#textproc/gsed +#devel/gettext +#devel/gettext-runtime +#devel/ding-libs +#devel/pkgconf +#net/xmlrpc-c +#devel/patch +#ports-mgmt/dialog4ports +#devel/py-pyyaml +#benchmarks/bonnie +#benchmarks/bonnie++ +#benchmarks/iozone +#devel/cvs +#ports-mgmt/portlint +#databases/py-sispy +#devel/rubygem-gettext-setup +#sysutils/dtrace-toolkit +#net-mgmt/nagios-check_hdd_health +#net-mgmt/nagios +#net-mgmt/nagios@monplugins +#sysutils/ezjail +#devel/py-pip +#sysutils/iocage +#sysutils/bhyve-firmware +#sysutils/vm-bhyve +#devel/jenkins +#benchmarks/sysbench +#sysutils/firstboot-pkgs +#sysutils/ec2-scripts +#sysutils/iohyve +#converters/unix2dos +#security/py-gssapi +#sysutils/py-salt +#dns/powerdns +#net-mgmt/adcli +#sysutils/cpu-microcode +#net-mgmt/telegraf +#sysutils/rsyslog8 +##security/bcrypt +#sysutils/x86info +#textproc/py-toml +#textproc/py-tomlkit +#devel/git-lfs +#sysutils/dnf +#sysutils/libdnf +#security/rkhunter +#security/chkrootkit +#security/trousers +#security/tpm-tools +#security/tpm2-tools +#security/tpm2-abrmd +#security/tpm-quote-tools + diff --git a/root/poudriere-build.sh b/root/poudriere-build.sh index 7d06ccc..b97d520 100755 --- a/root/poudriere-build.sh +++ b/root/poudriere-build.sh @@ -5,7 +5,7 @@ set -x /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/142x64.list -j 142x64 -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/klara.list -j klara -p default -O klara_ports +#/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/klara.list -j klara -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 @@ -14,3 +14,5 @@ set -x # Syncro /usr/local/bin/cpdup -i0 /usr/local/poudriere/data/logs/ kiwi@pkg-cache:/usr/local/poudriere/data/logs/ /usr/local/bin/cpdup -i0 /usr/local/poudriere/data/packages/ kiwi@pkg-cache:/usr/local/poudriere/data/packages/ +/usr/local/bin/cpdup -C -i0 /usr/local/poudriere/data/logs/ kiwi@ns1.oav.net:/usr/local/poudriere/data/logs/ +/usr/local/bin/cpdup -C -i0 /usr/local/poudriere/data/packages/ kiwi@ns1.oav.net:/usr/local/poudriere/data/packages/ diff --git a/root/poudriere-portsnap.sh b/root/poudriere-portsnap.sh index ade3987..eaadafc 100755 --- a/root/poudriere-portsnap.sh +++ b/root/poudriere-portsnap.sh @@ -3,4 +3,5 @@ /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 -u -p sudomk /usr/local/bin/poudriere ports -l