diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index 1be4bd27c2c0..5572748ddf26 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -1,9 +1,10 @@ -PROG = rpc.rstatd -SRCS = rstatd.c rstat_proc.c -MAN = rpc.rstatd.8 +PACKAGE= rcmds +PROG= rpc.rstatd +SRCS= rstatd.c rstat_proc.c +MAN= rpc.rstatd.8 LIBADD= rpcsvc devstat WARNS?= 1 .include diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index 49d155c969b5..f59002e4b5fd 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -1,12 +1,13 @@ -PROG = rpc.rusersd -SRCS = rusersd.c rusers_proc.c extern.h -MAN = rpc.rusersd.8 +PACKAGE= rcmds +PROG= rpc.rusersd +SRCS= rusersd.c rusers_proc.c extern.h +MAN= rpc.rusersd.8 LIBADD= rpcsvc #.if exists(/usr/X11R6/include/X11/extensions/xidle.h) #CFLAGS+= -DXIDLE #LDADD+= -L/usr/X11R6/lib -lXext -lX11 #.endif .include diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile index 38a9646166d0..8d10a91fffd0 100644 --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -1,9 +1,10 @@ -PROG = rpc.rwalld -SRCS = rwalld.c -MAN = rpc.rwalld.8 +PACKAGE= rcmds +PROG= rpc.rwalld +SRCS= rwalld.c +MAN= rpc.rwalld.8 LIBADD= util WARNS?= 2 .include diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index b8b200d0966e..4a1e1920b64e 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,187 +1,191 @@ # # acct_COMMENT= System Accounting Utilities acct_DESC= System Accounting Utilities acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities audit_COMMENT= OpenBSM auditing utilities audit_DESC= OpenBSM auditing utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities blocklist_COMMENT= Blocklist Utilities blocklist_DESC= Blocklist Utilities bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader bootloader_DESC= Bootloader and configuration files bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities caroot_COMMENT= SSL Certificates caroot_DESC= SSL Certificates clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries certctl_COMMENT= SSL Certificate Utility certctl_DESC= SSL Certificate Utility console-tools_COMMENT= Console Utilities console-tools_DESC= Console Utilities cron_COMMENT= cron(8) and crontab(1) cron_DESC= cron(8) and crontab(1) csh_COMMENT= C Shell csh_DESC= C Shell ctf-tools_COMMENT= CTF Utilities ctf-tools_DESC= CTF Utilities cxgbe-tools_COMMENT= Chelsio cxbge Utilities cxgbe-tools_DESC= Chelsio cxbge Utilities devd_COMMENT= Devd Utility and scripts devd_DESC= Devd Utility and scripts devmatch_COMMENT= Devmatch Utility devmatch_DESC= Devmatch Utility dhclient_COMMENT= DHCP Client dhclient_DESC= DHCP Client dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation dtrace_COMMENT= Dtrace Utilities dtrace_DESC= Dtrace Utilities dwatch_COMMENT= Dwatch Utilities dwatch_DESC= Dwatch Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities elftoolchain_COMMENT= ElfToolchain programs and libraries elftoolchain_DESC= ElfToolchain programs and libraries examples_COMMENT= Examples in /usr/share/examples examples_DESC= Examples in /usr/share/examples fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility firmware-iwm_DESC= iwm(4) firmwares firmware-iwm_COMMENT= iwm(4) firmwares ftp_COMMENT= FTP Utilities ftp_DESC= FTP Utilities ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon fwget_COMMENT= FWGET Utility fwget_DESC= FWGET Utility games_COMMENT= Games games_DESC= Games geom_COMMENT= GEOM Utilitites geom_DESC= GEOM Utilitites ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities inetd_COMMENT= Internet super-server inetd_DESC= Internet super-server jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kerberos_COMMENT= Kerberos Utilities kerberos_DESC= Kerberos Utilities kerberos-lib_COMMENT= Kerberos Libraries kerberos-lib_DESC= Kerberos Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel lp_COMMENT= Printer subsystem lp_DESC= Printer subsystem manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files netmap_COMMENT= Netmap Library and Utilities netmap_DESC= Netmap Library and Utilities newsyslog_COMMENT= Newsyslog Utility newsyslog_DESC= Newsyslog Utility nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities ntp_COMMENT= Network Time Protocol server and client ntp_DESC= Network Time Protocol server and client nuageinit_COMMENT= CloudInit support scripts nuageinit_DESC= CloudInit support scripts nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities openssl_COMMENT= OpenSSL Utility openssl_DESC= OpenSSL Utility openssl-lib_COMMENT= OpenSSL Libraries openssl-lib_DESC= OpenSSL Libraries pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility periodic_DESC= Periodic Utility rc_COMMENT= RC Scripts rc_DESC= RC Scripts -rcmds_COMMENT= Remote Command Utilities -rcmds_DESC= Remote Command Utilities +rcmds_COMMENT= BSD/SunOS remote status commands +rcmds_DESC=\ +The BSD/SunOS remote status commands, which can be used to query or interact\ +with remote hosts over the network. This includes the command-line utilities\ +rwho, ruptime, rup, rusers and rwall and the daemons rwhod, rpc.rstatd,\ +rpc.rusersd, and rpc.rwalld. rdma_COMMENT= RDMA Utilities rdma_DESC= RDMA Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities resolvconf_COMMENT= Resolvconf Utility and scripts resolvconf_DESC= Resolvconf Utility and scripts runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities smbutils_COMMENT= SMB Utilities smbutils_DESC= SMB Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console syslogd_COMMENT= Syslog Daemon syslogd_DESC= Syslog Daemon tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet client telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite ufs_COMMENT= UFS Libraries and Utilities ufs_DESC= UFS Libraries and Utilities unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver utilities_COMMENT= Non-vital programs and libraries utilities_DESC= Non-vital programs and libraries vi_COMMENT= Vi Editor vi_DESC= Vi Editor vt_COMMENT= VT fonts and keyboard files vt_DESC= VT fonts and keyboard files wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs zfs_COMMENT= ZFS Libraries and Utilities zfs_DESC= ZFS Libraries and Utilities diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index b7d6875b3eb1..b7d7bad35023 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -1,164 +1,168 @@ #!/bin/sh # # main() { desc= comment= debug= uclsource= while getopts "do:s:u:" arg; do case ${arg} in d) debug=1 ;; o) outname="${OPTARG}" origname="${OPTARG}" ;; s) srctree="${OPTARG}" ;; u) uclfile="${OPTARG}" ;; *) echo "Unknown argument" ;; esac done shift $(( ${OPTIND} - 1 )) case "${outname}" in bootloader) pkgdeps="" ;; certctl) pkgdeps="caroot openssl" ;; clang) pkgdeps="lld libcompiler_rt-dev" ;; periodic) pkgdeps="cron" ;; + rcmds) + # the RPC daemons require rpcbind + pkgdeps="utilities" + ;; # -dev packages that have no corresponding non-dev package # as a dependency. libcompat-dev|libcompiler_rt-dev|liby-dev) outname=${outname%%-dev} _descr="Development Files" ;; libcompat-lib32_dev|libcompiler_rt-lib32_dev|liby-lib32_dev) outname=${outname%%-lib32_dev} _descr="32-bit Libraries, Development Files" ;; libcompat-man|libelftc-man) outname=${outname%%-man} _descr="Manual Pages" ;; utilities) uclfile="${uclfile}" ;; runtime) outname="runtime" _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" ;; *-lib32_dev) outname="${outname%%-lib32_dev}" _descr="32-bit Libraries, Development Files" pkgdeps="${outname}" ;; *-lib32_dbg) outname="${outname%%-lib32_dbg}" _descr="32-bit Libraries, Debugging Symbols" pkgdeps="${outname}" ;; *-lib32) outname="${outname%%-lib32}" _descr="32-bit Libraries" pkgdeps="${outname}" ;; *-dev) outname="${outname%%-dev}" _descr="Development Files" pkgdeps="${outname}" ;; *-dbg) outname="${outname%%-dbg}" _descr="Debugging Symbols" pkgdeps="${outname}" ;; *-man) outname="${outname%%-man}" _descr="Manual Pages" pkgdeps="${outname}" ;; ${origname}) ;; *) uclfile="${outname##*}${origname}" outname="${outname##*}${origname}" ;; esac desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)" comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)" uclsource="${srctree}/release/packages/template.ucl" if [ -n "${debug}" ]; then echo "" echo "===============================================================" echo "DEBUG:" echo "_descr=${_descr}" echo "outname=${outname}" echo "origname=${origname}" echo "srctree=${srctree}" echo "uclfile=${uclfile}" echo "desc=${desc}" echo "comment=${comment}" echo "vital=${vital}" echo "cp ${uclsource} -> ${uclfile}" echo "===============================================================" echo "" echo "" echo "" fi [ -z "${comment}" ] && comment="${outname} package" [ -n "${_descr}" ] && comment="${comment} (${_descr})" [ -z "${desc}" ] && desc="${outname} package" cp "${uclsource}" "${uclfile}" if [ -n "${pkgdeps}" ]; then echo 'deps: {' >> ${uclfile} for dep in ${pkgdeps}; do cat <> ${uclfile} ${PKG_NAME_PREFIX}-${dep}: { origin: "base", version: "${PKG_VERSION}" } EOF done echo '}' >> ${uclfile} fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" ${srctree}/release/packages/generate-ucl.lua \ VERSION "${PKG_VERSION}" \ PKGNAME "${origname}" \ PKGGENNAME "${outname}" \ PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ COMMENT "${comment}" \ DESC "${desc}" \ CAP_MKDB_ENDIAN "${cap_arg}" \ PKG_WWW "${PKG_WWW}" \ PKG_MAINTAINER "${PKG_MAINTAINER}" \ UCLFILES "${srctree}/release/packages/" \ ${uclfile} ${uclfile} return 0 } main "${@}" diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile index 8cc5dc0f1af0..28558d052be4 100644 --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -1,5 +1,6 @@ +PACKAGE= rcmds PROG= rup LIBADD= rpcsvc .include diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile index f3b3a8bd7db0..d3f3158d7be1 100644 --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -1,5 +1,6 @@ -PROG = rusers +PACKAGE= rcmds +PROG= rusers LIBADD= rpcsvc .include diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile index 88459adb760f..b0902be9cec8 100644 --- a/usr.bin/rwall/Makefile +++ b/usr.bin/rwall/Makefile @@ -1,3 +1,4 @@ -PROG = rwall +PACKAGE= rcmds +PROG= rwall .include