From 82098cafa428ecd5fd3b862665c2ee760d80b672 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Tue, 14 Oct 2025 12:12:30 +0200 Subject: [PATCH] Update poudiere --- poudriere/poudriere.d/142x64-make.conf | 18 +- poudriere/poudriere.d/142x64.list | 55 +++- poudriere/poudriere.d/143x64-make.conf | 133 +++++++++ poudriere/poudriere.d/143x64-options | 1 + poudriere/poudriere.d/143x64.list | 305 +++++++++++++++++++++ poudriere/poudriere.d/klara-make.conf | 28 +- poudriere/poudriere.d/klara.list | 12 +- poudriere/poudriere.d/verisign13-make.conf | 59 ++-- poudriere/poudriere.d/verisign13.list | 6 +- poudriere/poudriere_lean.conf | 3 +- root/poudriere-build.sh | 13 +- root/poudriere-cleanlogs.sh | 5 +- root/poudriere-pkgclean.sh | 6 +- 13 files changed, 584 insertions(+), 60 deletions(-) create mode 100644 poudriere/poudriere.d/143x64-make.conf create mode 120000 poudriere/poudriere.d/143x64-options create mode 100644 poudriere/poudriere.d/143x64.list diff --git a/poudriere/poudriere.d/142x64-make.conf b/poudriere/poudriere.d/142x64-make.conf index 393ef34..5641afe 100644 --- a/poudriere/poudriere.d/142x64-make.conf +++ b/poudriere/poudriere.d/142x64-make.conf @@ -118,10 +118,16 @@ WITH_DEBUG=YES CFLAGS+=-fno-omit-frame-pointer .endif -# Sogo etc... -#.if ${.CURDIR:M*/devel/sope} -#OPTIONS_FILE_UNSET+=LDAP -#OPTIONS_FILE_UNSET+=PGSQL -#OPTIONS_FILE_SET+=MYSQL -#.endif +.if ${.CURDIR:M*/net-p2p/transmission} +OPTIONS_FILE_UNSET+=GTK +OPTIONS_FILE_UNSET+=QT +OPTIONS_FILE_UNSET+=DOCS +OPTIONS_FILE_SET+=CLI +OPTIONS_FILE_SET+=DAEMON +OPTIONS_FILE_SET+=WEB +.endif + +.if ${.CURDIR:M*/databases/rrdtool} +OPTIONS_FILE_SET+=PYTHON +.endif diff --git a/poudriere/poudriere.d/142x64.list b/poudriere/poudriere.d/142x64.list index 46eb518..fbc3fce 100644 --- a/poudriere/poudriere.d/142x64.list +++ b/poudriere/poudriere.d/142x64.list @@ -117,28 +117,32 @@ ftp/wget archivers/zstd www/domoticz www/domoticz-devel -net-mgmt/unifi8 +net-mgmt/unifi9 net-mgmt/librenms textproc/jq lang/erlang lang/elixir databases/postgresql14-server databases/postgresql14-contrib +databases/postgresql17-server +databases/postgresql17-contrib www/grafana -www/npm-node18 +www/npm-node22 +www/npm sysutils/bastille ports-mgmt/poudriere ports-mgmt/poudriere-devel ports-mgmt/portshaker www/gitea +devel/gitea-act_runner www/adguardhome -comms/py-ModbusTCP -comms/py-pymodbus +#comms/py-ModbusTCP +#comms/py-pymodbus www/yt-dlp multimedia/plexmediaserver net/netatalk3 databases/mariadb106-server -databases/mariadb105-server +databases/mariadb118-server finance/nextcloud-cospend mail/nextcloud-mail net-im/nextcloud-spreed-signaling @@ -201,8 +205,8 @@ sysutils/dmidecode emulators/qemu-user-static security/acmetool benchmarks/flamegraph -net/openbgpd6 net/openbgpd7 +net/openbgpd8 irc/weechat sysutils/tmate ports-mgmt/portfmt @@ -214,6 +218,7 @@ www/groupoffice #mail/imapsync sysutils/powerdxx multimedia/emby-server +multimedia/jellyfin sysutils/freeipmi net/py-paho-mqtt devel/py-logzero @@ -223,6 +228,7 @@ ports-mgmt/portsnap net/mtr@nox11 devel/freebsd-git-devtools graphics/gpu-firmware-kmod +net/wifi-firmware-rtw89-kmod ports-mgmt/portlint sysutils/cpdup net/dhcp6 @@ -246,8 +252,6 @@ textproc/hs-pandoc emulators/qemu@nox11 sysutils/puppetserver8 sysutils/puppet8 -# Webmail -www/sogo-activesync sysutils/puppetserver8 sysutils/puppet8 comms/py-sdm_modbus @@ -264,3 +268,38 @@ www/py-homeassistant mail/imapsync comms/iwmbt-firmware net/wifi-firmware-iwlwifi-kmod +# JT +#textproc/ctv +net/wireguard-tools +# Dep domoticz +devel/jwt-cpp +net-im/py-slack-sdk +sysutils/lsblk +net/mtr@nox11 +www/forgejo +# test +# Yubikey +security/py-yubikey-manager +devel/pcsc-lite +security/yubico-piv-tool +# +net-p2p/transmission +#net-p2p/transmission-components +#net-p2p/transmission-remote-gui +#www/aria2 +# Acme stuff +security/acmetool +security/lego +#net/samba416 +#net/samba419 +net/samba422 +net-mgmt/netbox +#www/unit +#www/unit-python +www/matomo +# Shelly +#databases/influxdb +#devel/py-configparser +# Bitcoin +net-p2p/bitcoin-daemon +net-p2p/bitcoin-utils diff --git a/poudriere/poudriere.d/143x64-make.conf b/poudriere/poudriere.d/143x64-make.conf new file mode 100644 index 0000000..5641afe --- /dev/null +++ b/poudriere/poudriere.d/143x64-make.conf @@ -0,0 +1,133 @@ +OPTIONS_UNSET+= X11 +#DEFAULT_VERSIONS= php=8.2 mysql=10.6m java=11 pgsql=14 mono=6.8 +DEFAULT_VERSIONS= mysql=10.6m +#DISABLE_LICENSES=yes +#LICENSES +LICENSES_ACCEPTED+=3GPP +LICENSES_ACCEPTED+=ACUBE +LICENSES_ACCEPTED+=ADOBE +LICENSES_ACCEPTED+=APL1 +LICENSES_ACCEPTED+=BSDCOMPATIBLE +LICENSES_ACCEPTED+=BSIML +LICENSES_ACCEPTED+=BuildLic +LICENSES_ACCEPTED+=CC0 +LICENSES_ACCEPTED+=CCBYNCSAv3 +LICENSES_ACCEPTED+=CCBYSAv3 +LICENSES_ACCEPTED+=CCBYv3 +LICENSES_ACCEPTED+=CCbyNC25 +LICENSES_ACCEPTED+=CCbyNCSA2 +LICENSES_ACCEPTED+=CCbyNCSA3 +LICENSES_ACCEPTED+=CCbySA30 +LICENSES_ACCEPTED+=CCbySA3 +LICENSES_ACCEPTED+=CCbySA40 +LICENSES_ACCEPTED+=CCbySA +LICENSES_ACCEPTED+=CLEARTHOUGHT +LICENSES_ACCEPTED+=COMMERCIAL +LICENSES_ACCEPTED+=CPL05 +LICENSES_ACCEPTED+=CPL +LICENSES_ACCEPTED+=CUBE +LICENSES_ACCEPTED+=CW +LICENSES_ACCEPTED+=CeCILL +LICENSES_ACCEPTED+=CeCILL_C +LICENSES_ACCEPTED+=DCC +LICENSES_ACCEPTED+=DMD +LICENSES_ACCEPTED+=DejaVu +LICENSES_ACCEPTED+=ECW +LICENSES_ACCEPTED+=EULA +LICENSES_ACCEPTED+=EUPL +LICENSES_ACCEPTED+=FAL +LICENSES_ACCEPTED+=FDK_AAC +LICENSES_ACCEPTED+=FFTPAK +LICENSES_ACCEPTED+=FLOSSE +LICENSES_ACCEPTED+=FPL +LICENSES_ACCEPTED+=GLEW +LICENSES_ACCEPTED+=GPLR +LICENSES_ACCEPTED+=HISIML +LICENSES_ACCEPTED+=HW +LICENSES_ACCEPTED+=IBM +LICENSES_ACCEPTED+=ICOT +LICENSES_ACCEPTED+=ICU +LICENSES_ACCEPTED+=IDPL +LICENSES_ACCEPTED+=FPL +LICENSES_ACCEPTED+=GLEW +LICENSES_ACCEPTED+=GPLR +LICENSES_ACCEPTED+=HISIML +LICENSES_ACCEPTED+=HW +LICENSES_ACCEPTED+=IBM +LICENSES_ACCEPTED+=ICOT +LICENSES_ACCEPTED+=ICU +LICENSES_ACCEPTED+=IDPL +LICENSES_ACCEPTED+=IFL +LICENSES_ACCEPTED+=IPL +LICENSES_ACCEPTED+=ISO +LICENSES_ACCEPTED+=IUP +LICENSES_ACCEPTED+=JAIDL +LICENSES_ACCEPTED+=JDOM +LICENSES_ACCEPTED+=JYTHON +LICENSES_ACCEPTED+=LINUXLIBERTINE +LICENSES_ACCEPTED+=LinuxdocTools +LICENSES_ACCEPTED+=MSPAT +LICENSES_ACCEPTED+=NAIST +LICENSES_ACCEPTED+=NAISTL +LICENSES_ACCEPTED+=NEWRELIC +LICENSES_ACCEPTED+=NKF +LICENSES_ACCEPTED+=NODE +LICENSES_ACCEPTED+=OFL +LICENSES_ACCEPTED+=OPENLDAP +LICENSES_ACCEPTED+=OTHER +LICENSES_ACCEPTED+=PUBLIC_DOMAIN +LICENSES_ACCEPTED+=PerconaFT +LICENSES_ACCEPTED+=QPL10 +LICENSES_ACCEPTED+=SENDMAIL +LICENSES_ACCEPTED+=SIL +LICENSES_ACCEPTED+=SpecialAuth +LICENSES_ACCEPTED+=TTYP0 +LICENSES_ACCEPTED+=TWAIN +LICENSES_ACCEPTED+=TclTk +LICENSES_ACCEPTED+=UIUC +LICENSES_ACCEPTED+=UNLICENSE +LICENSES_ACCEPTED+=UNRAR +LICENSES_ACCEPTED+=VOLITION +LICENSES_ACCEPTED+=W3C +LICENSES_ACCEPTED+=WARSOW +LICENSES_ACCEPTED+=addl +LICENSES_ACCEPTED+=imlib2 +LICENSES_ACCEPTED+=unknown +LICENSES_ACCEPTED+=NONE +LICENSES_ACCEPTED+=bolthole +LICENSES_ACCEPTED+=BOLTHOLE + +# Postfix +.if ${.CURDIR:M*/mail/postfix} +CFLAGS+=-DRECEIVED_ENVELOPE_FROM +.endif + +# Domoticz-devel +.if ${.CURDIR:M*/www/domoticz-devel} +WITH_DEBUG=YES +CFLAGS+=-fno-omit-frame-pointer +.endif + +# openbgpd +.if ${.CURDIR:M*/net/openbgpd6} +WITH_DEBUG=YES +CFLAGS+=-fno-omit-frame-pointer +.endif +.if ${.CURDIR:M*/net/openbgpd7} +WITH_DEBUG=YES +CFLAGS+=-fno-omit-frame-pointer +.endif + +.if ${.CURDIR:M*/net-p2p/transmission} +OPTIONS_FILE_UNSET+=GTK +OPTIONS_FILE_UNSET+=QT +OPTIONS_FILE_UNSET+=DOCS +OPTIONS_FILE_SET+=CLI +OPTIONS_FILE_SET+=DAEMON +OPTIONS_FILE_SET+=WEB +.endif + +.if ${.CURDIR:M*/databases/rrdtool} +OPTIONS_FILE_SET+=PYTHON +.endif + diff --git a/poudriere/poudriere.d/143x64-options b/poudriere/poudriere.d/143x64-options new file mode 120000 index 0000000..c8a8df5 --- /dev/null +++ b/poudriere/poudriere.d/143x64-options @@ -0,0 +1 @@ +142x64-options \ No newline at end of file diff --git a/poudriere/poudriere.d/143x64.list b/poudriere/poudriere.d/143x64.list new file mode 100644 index 0000000..fbc3fce --- /dev/null +++ b/poudriere/poudriere.d/143x64.list @@ -0,0 +1,305 @@ +archivers/7-zip +shells/bash +dns/bind918 +security/ca_root_nss +devel/ccache +ftp/curl +textproc/expat2 +x11-fonts/fontconfig +print/freetype2 +lang/gawk +devel/gettext-runtime +graphics/giflib +devel/gmake +textproc/gsed +graphics/jbigkit +graphics/jpeg-turbo +security/libargon2 +archivers/libdeflate +devel/libedit +devel/libevent +devel/libffi +security/libgcrypt +graphics/gd +# not found security/libgpg +converters/libiconv +dns/libidn2 +archivers/liblz4 +www/libnghttp2 +dns/libpsl +devel/libsigsegv +security/libssh2 +devel/libsysinfo +devel/libunistring +textproc/libxml2 +textproc/libxslt +archivers/libzip +sysutils/monit +math/mpdecimal +net-mgmt/nagios-plugins +www/nginx +www/freenginx +sysutils/node_exporter +net-mgmt/nrpe +devel/oniguruma +java/openjdk11 +security/openssl +security/openvpn +devel/pcre2 +lang/php81 +lang/php82 +devel/php-composer +textproc/php81-ctype +textproc/php82-ctype +ftp/php81-curl +textproc/php81-dom +textproc/php82-dom +sysutils/php81-fileinfo +sysutils/php82-fileinfo +security/php81-filter +security/php82-filter +ftp/php81-ftp +ftp/php82-ftp +graphics/php81-gd +graphics/php82-gd +converters/php81-iconv +converters/php82-iconv +devel/php81-intl +devel/php82-intl +converters/php81-mbstring +converters/php82-mbstring +databases/php81-pdo +databases/php82-pdo +databases/php81-pdo_mysql +databases/php82-pdo_mysql +converters/pear-Services_JSON +devel/pecl-APCu +databases/pecl-redis +archivers/php81-phar +archivers/php82-phar +devel/pear +sysutils/php81-posix +sysutils/php82-posix +www/php81-session +www/php82-session +textproc/php81-simplexml +textproc/php82-simplexml +devel/php81-tokenizer +devel/php82-tokenizer +textproc/php81-xml +textproc/php82-xml +textproc/php81-xmlreader +textproc/php82-xmlreader +textproc/php81-xmlwriter +textproc/php82-xmlwriter +textproc/php81-xsl +textproc/php82-xsl +archivers/php81-zip +archivers/php82-zip +archivers/php81-zlib +archivers/php82-zlib +ports-mgmt/pkg +devel/pkgconf +graphics/png +mail/postfix +lang/python3 +lang/python39 +lang/python312 +devel/readline +databases/redis +sysutils/screen +security/sudo +graphics/tiff +sysutils/tmux +editors/vim +graphics/webp +ftp/wget +archivers/zstd +www/domoticz +www/domoticz-devel +net-mgmt/unifi9 +net-mgmt/librenms +textproc/jq +lang/erlang +lang/elixir +databases/postgresql14-server +databases/postgresql14-contrib +databases/postgresql17-server +databases/postgresql17-contrib +www/grafana +www/npm-node22 +www/npm +sysutils/bastille +ports-mgmt/poudriere +ports-mgmt/poudriere-devel +ports-mgmt/portshaker +www/gitea +devel/gitea-act_runner +www/adguardhome +#comms/py-ModbusTCP +#comms/py-pymodbus +www/yt-dlp +multimedia/plexmediaserver +net/netatalk3 +databases/mariadb106-server +databases/mariadb118-server +finance/nextcloud-cospend +mail/nextcloud-mail +net-im/nextcloud-spreed-signaling +net-im/nextcloud-talk +security/nextcloud-end_to_end_encryption +security/nextcloud-passman +security/nextcloud-twofactor_admin +security/nextcloud-twofactor_webauthn +www/nextcloud +www/nextcloud-appointments +www/nextcloud-calendar +www/nextcloud-contacts +www/nextcloud-deck +www/nextcloud-forms +www/nextcloud-groupfolders +www/nextcloud-notes +www/nextcloud-tasks +net-mgmt/rubygem-oxidized +net-mgmt/rubygem-oxidized-script +net-mgmt/rubygem-oxidized-web +comms/owfs +databases/py-aiosqlite +devel/py-click-log +devel/py-coloredlogs +dns/py-dnspython +textproc/py-humanfriendly +devel/py-jsonschema +devel/py-jsonschema3 +devel/py-pip +devel/py-pyrsistent +comms/py-pyserial +comms/py-pyserial-asyncio +devel/py-pyusb +databases/py-sqlite3 +devel/py-voluptuous +sysutils/zrep +sysutils/hatop +sysutils/htop +sysutils/ipmitool +sysutils/panicmail +sysutils/pwgen +sysutils/sanoid +sysutils/smartmontools +filesystems/ztop +net/rsync +net-mgmt/iftop +net-mgmt/nstat +net/socat +mail/ssmtp +news/sabnzbd +net-p2p/radarr +net-p2p/sonarr +net-p2p/lidarr +net-p2p/jackett +#sysutils/bhyve+ +sysutils/bhyve-firmware +sysutils/grub2-bhyve +sysutils/vm-bhyve +sysutils/dmidecode +emulators/qemu-user-static +security/acmetool +benchmarks/flamegraph +net/openbgpd7 +net/openbgpd8 +irc/weechat +sysutils/tmate +ports-mgmt/portfmt +www/squid +net/intel-ixl-kmod +sysutils/py-salt +net-mgmt/py-pysnmp +www/groupoffice +#mail/imapsync +sysutils/powerdxx +multimedia/emby-server +multimedia/jellyfin +sysutils/freeipmi +net/py-paho-mqtt +devel/py-logzero +net/py-pyprowl +emulators/qemu-user-static +ports-mgmt/portsnap +net/mtr@nox11 +devel/freebsd-git-devtools +graphics/gpu-firmware-kmod +net/wifi-firmware-rtw89-kmod +ports-mgmt/portlint +sysutils/cpdup +net/dhcp6 +sysutils/lsof +#klara +#graphics/librsvg2-rust +#devel/gettext-tools +#devel/gettext-runtime +#devel/popt +#net/openldap26-client +#security/nss +#security/libpwquality +#sysutils/cmocka +#devel/ding-libs +#net/xmlrpc-c +#net/freeipa-client +www/joomla5 +graphics/drm-kmod +www/yarn +textproc/hs-pandoc +emulators/qemu@nox11 +sysutils/puppetserver8 +sysutils/puppet8 +sysutils/puppetserver8 +sysutils/puppet8 +comms/py-sdm_modbus +net/gitup +misc/ollama +emulators/libc6-shim +sysutils/pv +print/tex-xetex +print/texlive-full +x11-fonts/linuxlibertine +x11-fonts/linuxlibertine-g +# TODO: +www/py-homeassistant +mail/imapsync +comms/iwmbt-firmware +net/wifi-firmware-iwlwifi-kmod +# JT +#textproc/ctv +net/wireguard-tools +# Dep domoticz +devel/jwt-cpp +net-im/py-slack-sdk +sysutils/lsblk +net/mtr@nox11 +www/forgejo +# test +# Yubikey +security/py-yubikey-manager +devel/pcsc-lite +security/yubico-piv-tool +# +net-p2p/transmission +#net-p2p/transmission-components +#net-p2p/transmission-remote-gui +#www/aria2 +# Acme stuff +security/acmetool +security/lego +#net/samba416 +#net/samba419 +net/samba422 +net-mgmt/netbox +#www/unit +#www/unit-python +www/matomo +# Shelly +#databases/influxdb +#devel/py-configparser +# Bitcoin +net-p2p/bitcoin-daemon +net-p2p/bitcoin-utils diff --git a/poudriere/poudriere.d/klara-make.conf b/poudriere/poudriere.d/klara-make.conf index 6742d45..81b1ff1 100644 --- a/poudriere/poudriere.d/klara-make.conf +++ b/poudriere/poudriere.d/klara-make.conf @@ -1,5 +1,5 @@ -OPTIONS_UNSET+= X11 -DEFAULT_VERSIONS= php=8.1 mysql=10.6m java=11 pgsql=14 mono=6.8 +#OPTIONS_UNSET+= X11 +#DEFAULT_VERSIONS= php=8.1 mysql=10.6m java=11 pgsql=14 mono=6.8 #DISABLE_LICENSES=yes #LICENSES LICENSES_ACCEPTED+=3GPP @@ -120,3 +120,27 @@ CFLAGS+=-fno-omit-frame-pointer #.if ${.CURDIR:M*/archivers/rpm4} #OPTIONS_FILE_SET=NOOPENMP #.endif + + +OPTIONS_UNSET+="NSL X11 DOCS GTK1 GTK2 GTK3 GUI QT4 QT5 COMPOSITE FONTCONFIGGLX XINERAMA XRANDR XVIDEO XVMC GNOME GNOMEKEYRING GNOMEVFS2 TCLTK TK" +#KRB5_HOME=/usr/local # default, unnecessary +#KRB5_IMPL=mit +WITH_GSSAPI="YES" +WANT_OPENLDAP_SASL="YES" +WITHOUT_X11="YES" +WITHOUT_GAMES="YES" +WITHOUT_HTML="YES" +ALLOW_UNSUPPORTED_SYSTEM="YES" +ENABLE_VTY_GROUP=quaggavty # Support Quagga +VALID_CATEGORIES+=local +BUILD_ALL_PYTHON_FLAVORS=yes + +# Set default openldap +#DEFAULT_OPENLDAP_VER= 24 +#DEFAULT_VERSIONS+=openldap=24 +# Default Python is 3.6 because it is required by sssd. It fails build with Python 3.7 +#DEFAULT_VERSIONS+= python=3.8 python3=3.8 +#DEFAULT_VERSIONS+= python=3.8 python3=3.8 samba=4.13 +#DEFAULT_VERSIONS+= python=3.9 python3=3.9 samba=4.13 +#DEFAULT_VERSIONS+= samba=4.20 + diff --git a/poudriere/poudriere.d/klara.list b/poudriere/poudriere.d/klara.list index daa595d..158bbd5 100644 --- a/poudriere/poudriere.d/klara.list +++ b/poudriere/poudriere.d/klara.list @@ -1,10 +1,12 @@ -ports-mgmt/poudriere -ports-mgmt/poudriere-devel +#ports-mgmt/poudriere +#ports-mgmt/poudriere-devel #sysutils/ngbuddy #net-mgmt/netbox-agent #devel/etcd35 #www/py-frappe-bench -sysutils/data-prepper -net/akhq +#sysutils/data-prepper +#net/akhq #net/samba420 - +#textproc/augeas +#www/libapreq2 +net/samba422 diff --git a/poudriere/poudriere.d/verisign13-make.conf b/poudriere/poudriere.d/verisign13-make.conf index 0147166..47b30a1 100644 --- a/poudriere/poudriere.d/verisign13-make.conf +++ b/poudriere/poudriere.d/verisign13-make.conf @@ -12,8 +12,18 @@ ENABLE_VTY_GROUP=quaggavty # Support Quagga VALID_CATEGORIES+=local BUILD_ALL_PYTHON_FLAVORS=yes -#DEFAULT_VERSIONS+= samba=4.13 -DEFAULT_VERSIONS+= samba=4.20 +DEFAULT_VERSIONS+= samba=4.20 perl5=5.38 + +.if ${.CURDIR:M*/security/libssh} +OPTIONS_FILE_UNSET+=GSSAPI_NONE +OPTIONS_FILE_UNSET+=GSSAPI_BASE +OPTIONS_FILE_UNSET+=GSSAPI_HEIMDAL +OPTIONS_FILE_SET+=GSSAPI_MIT +.endif + +.if ${.CURDIR:M*/security/sssd*} +OPTIONS_FILE_SET+=SMB +.endif .if ${.CURDIR:M*/ftp/curl} OPTIONS_FILE_UNSET+=GSSAPI_BASE @@ -34,22 +44,27 @@ 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_SET+=SSSD2 +OPTIONS_FILE_UNSET+=SSSD_DEVEL OPTIONS_FILE_UNSET+=GSSAPI_BASE OPTIONS_FILE_UNSET+=GSSAPI_HEIMDAL OPTIONS_FILE_UNSET+=GSSAPI_MIT .endif -#.if ${.CURDIR:M*/databases/ldb2*} -#PTIONS_FILE_SET+=PYTHON3 -#.endif +.if ${.CURDIR:M*/databases/ldb2*} +OPTIONS_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 +#OPTIONS_FILE_UNSET+=AVAHI +#OPTIONS_SINGLE_ZEROCONF=ZEROCONF_NONE +SAMBA4_BUNDLED_LDB=no +#SAMBA4_BUNDLED_TALLOC=no +#SAMBA4_BUNDLED_TEVENT=no +#SAMBA4_BUNDLED_TDB=no +.endif .if ${.CURDIR:M*/java/openjdk*} OPTIONS_FILE_UNSET+=X11 @@ -77,17 +92,21 @@ 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 OPTIONS_FILE_SET+=GSSAPI_MIT .endif + +.if ${.CURDIR:M*/misc/libuuid} +OPTIONS_FILE_UNSET+=MANPAGES +.endif diff --git a/poudriere/poudriere.d/verisign13.list b/poudriere/poudriere.d/verisign13.list index 42ee65d..d8b1747 100644 --- a/poudriere/poudriere.d/verisign13.list +++ b/poudriere/poudriere.d/verisign13.list @@ -8,7 +8,7 @@ #lang/ruby30 # XXX: fixx #security/sudo -security/sudo@sssd +#security/sudo@sssd #sysutils/cdrtools #sysutils/dvd+rw-tools #.sysutils/dmidecode @@ -82,7 +82,7 @@ security/sudo@sssd #devel/py-six #devel/py-boto #sysutils/gpart -net/cloud-init +#net/cloud-init #filesystems/e2fsprogs #archivers/rpm4 #sysutils/ansible @@ -95,7 +95,7 @@ net/cloud-init #devel/py-ipaddr #net/py-netifaces #security/sssd -#security/sssd2 +security/sssd2 #security/sssd2-klara #security/openssl #security/krb5 diff --git a/poudriere/poudriere_lean.conf b/poudriere/poudriere_lean.conf index 2d8c5c5..aebe22f 100644 --- a/poudriere/poudriere_lean.conf +++ b/poudriere/poudriere_lean.conf @@ -182,6 +182,7 @@ CCACHE_DIR=/var/ccache # # Example to define PARALLEL_JOBS to one single job # PARALLEL_JOBS=1 +PARALLEL_JOBS=4 # How many jobs should be used for preparing the build? These tend to # be more IO bound and may be worth tweaking. Default: PARALLEL_JOBS * 1.25 @@ -237,7 +238,7 @@ ALLOW_MAKE_JOBS_PACKAGES="pkg ccache py* gcc* clang* llvm* openjdk* rust* erlang # This will be used for giving URL hints to the HTML output when # scheduling and starting builds #URL_BASE=http://yourdomain.com/poudriere/ -URL_BASE=http://pkg2.home.oav.net/ +URL_BASE=http://pkg.oav.net/ # This defines the max time (in seconds) that a command may run for a build diff --git a/root/poudriere-build.sh b/root/poudriere-build.sh index 7e2fd47..ed7031c 100755 --- a/root/poudriere-build.sh +++ b/root/poudriere-build.sh @@ -1,11 +1,10 @@ #!/bin/sh set -x -#/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/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/142x64.list -j 142x64 -p default -O kiwi_ports +/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/143x64.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/130x64.list -j 130x64 -p default #/usr/local/bin/poudriere bulk -f /usr/local/etc/poudriere.d/120x64.list -j 120x64 -p default @@ -14,5 +13,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/ +#/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-cleanlogs.sh b/root/poudriere-cleanlogs.sh index 18b88a7..143aad8 100755 --- a/root/poudriere-cleanlogs.sh +++ b/root/poudriere-cleanlogs.sh @@ -1,9 +1,6 @@ #!/bin/sh -/usr/local/bin/poudriere logclean -j 130x64 -y 15 -/usr/local/bin/poudriere logclean -j 140x64 -y 15 -/usr/local/bin/poudriere logclean -j 141x64 -y 15 -/usr/local/bin/poudriere logclean -j 142x64 -y 15 +/usr/local/bin/poudriere logclean -j 143x64 -y 15 /usr/local/bin/poudriere logclean -j klara -y 15 /usr/local/bin/poudriere logclean -j verisign13 -y 15 #/usr/local/bin/poudriere logclean -j 120x64 -y 15 diff --git a/root/poudriere-pkgclean.sh b/root/poudriere-pkgclean.sh index 2d83ea5..00a3f3f 100755 --- a/root/poudriere-pkgclean.sh +++ b/root/poudriere-pkgclean.sh @@ -1,8 +1,6 @@ #!/bin/sh -#/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/142x64.list -j 142x64 -p default -y -O kiwi_ports +/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/143x64.list -j 143x64 -p default -y -O kiwi_ports +/usr/local/bin/poudriere pkgclean -f /usr/local/etc/poudriere.d/klara.list -j klara -p default -y -O klara_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