Index: head/mail/dspam/pkg-message =================================================================== --- head/mail/dspam/pkg-message (revision 495858) +++ head/mail/dspam/pkg-message (revision 495859) @@ -1,14 +1,14 @@ --------------------------------------------------------------------------- %%WebUI%% The WebUI files have been installed to: %%WebUI%% %%WWWDIR%% %%WebUI%% -%%DAEMON%% To enable the dspam deamon set dspam_enable="YES" in: +%%DAEMON%% To enable the dspam daemon set dspam_enable="YES" in: %%DAEMON%% /etc/rc.conf %%DAEMON%% Additional setup instructions can be found at: %%DOCSDIR%% %%EXAMPLESDIR%% --------------------------------------------------------------------------- Index: head/multimedia/kissdx/files/kissdx.in =================================================================== --- head/multimedia/kissdx/files/kissdx.in (revision 495858) +++ head/multimedia/kissdx/files/kissdx.in (revision 495859) @@ -1,30 +1,30 @@ #!/bin/sh # -# Script to start and stop the KiSS DX deamon, using the rc.subr functionality +# Script to start and stop the KiSS DX daemon, using the rc.subr functionality # # Add the following lines to /etc/rc.conf to enable this service at boot time: # # kissdx_enable="YES" (kissdx="YES" for NetBSD) # # PROVIDE: kissdx # . /etc/rc.subr # Name of program to start name="kissdx" # Full path to program command="%%PREFIX%%/sbin/${name}" # Arguments used to start program command_args="-kd" required_files="%%PREFIX%%/etc/${name}.conf" # Load variables from rc.conf load_rc_config $name # Invoke the rc.subr run_rc_command "$1" Index: head/net/ceph12/Makefile =================================================================== --- head/net/ceph12/Makefile (revision 495858) +++ head/net/ceph12/Makefile (revision 495859) @@ -1,151 +1,151 @@ # Created by: Willem Jan Withagen # $FreeBSD$ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 12.2.11 CATEGORIES= net PKGNAMESUFFIX= 12 MAINTAINER= wjw@digiware.nl COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ yasm:devel/yasm \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools RUN_DEPENDS= \ bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt \ xml:textproc/xmlstarlet \ jq:textproc/jq \ flock:sysutils/flock \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} CONFLICTS_INSTALL= ceph-devel PORTSCOUT= limit:^v12\. USES= cmake:noninja fuse gettext-runtime gmake \ pkgconfig python:2.7 shebangfix ssl USE_PYTHON= cython USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:de23828:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:googletest:fdb8504:googletest/src/googletest GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:e15382c:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd CMAKE_ARGS= \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D CEPH_MAN_DIR:STRING=man \ -D WITH_LTTNG:BOOL=OFF \ -D WITH_BABELTRACE:BOOL=OFF \ -D WITH_KRBD:BOOL=OFF \ -D WITH_XFS:BOOL=OFF \ -D WITH_KVS:BOOL=OFF \ -D WITH_BLKID:BOOL=OFF \ -D WITH_SPDK:BOOL=OFF \ -D WITH_RDMA=OFF \ -D WITH_BLUESTORE:BOOL=OFF \ -D WITH_LIBCEPHFS:BOOL=OFF \ -D WITH_CEPHFS:BOOL=OFF \ -D WITH_EMBEDDED:BOOL=OFF \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D WITH_BOOST_CONTEXT:BOOL=OFF \ -D WITH_FUSE:BOOL=ON \ -D WITH_MANPAGE:BOOL=ON \ -D WITH_RADOSGW_BEAST_FRONTEND:BOOL=OFF \ -D WITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/brag/client/ceph-brag src/ceph-rest-api \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys USE_RC_SUBR= ceph USE_LDCONFIG= yes USERS= ceph GROUPS= ceph post-patch: ${REINPLACE_CMD} 's|sphinx-build|sphinx-build-${PYTHON_VER}|g' ${WRKSRC}/CMakeLists.txt pre-configure: ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} ${FILESDIR}/file-git_version ${WRKSRC}/src/.git_version post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular - # starting and stopping deamons. rc.d work is done thru + # starting and stopping daemons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. ${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph # remove files not packaged ${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config ${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf ${RMDIR} ${STAGEDIR}${DOCSDIR} ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev # ceph-volume does not support ZFS ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-* ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/ ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd ${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume* ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample .include Index: head/net/ceph13/Makefile =================================================================== --- head/net/ceph13/Makefile (revision 495858) +++ head/net/ceph13/Makefile (revision 495859) @@ -1,157 +1,157 @@ # Created by: Willem Jan Withagen # $FreeBSD$ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 13.2.1 PKGNAMESUFFIX= 13 CATEGORIES= net MAINTAINER= wjw@digiware.nl COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= \ bash:shells/bash \ git:devel/git \ yasm:devel/yasm \ sphinx-build:textproc/py-sphinx \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ libcryptopp.so:security/cryptopp \ liboath.so:security/oath-toolkit \ libsnappy.so:archivers/snappy \ libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 \ libexpat.so:textproc/expat2 \ liblz4.so:archivers/liblz4 \ libplds4.so:devel/nspr \ libtcmalloc.so:devel/google-perftools RUN_DEPENDS= \ bash:shells/bash \ ${LOCALBASE}/bin/getopt:misc/getopt \ xml:textproc/xmlstarlet \ jq:textproc/jq \ flock:sysutils/flock \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} USES= cmake:noninja fuse gettext-runtime gmake pkgconfig python:2.7 \ shebangfix ssl USE_PYTHON= cython USE_OPENLDAP= yes USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT CONFLICTS_INSTALL= ceph PORTSCOUT= limit:^v13\. GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus GH_TUPLE+= ceph:civetweb:de23828:civetweb/src/civetweb GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure GH_TUPLE+= ceph:googletest:fdb8504:googletest/src/googletest GH_TUPLE+= ceph:isa-l:7e1a337:isa_l/src/isa-l GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:f4a857d:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd # oude hashes # GH_TUPLE+= ceph:rocksdb:e15382c:rocksdb/src/rocksdb # GH_TUPLE+= ceph:rocksdb:9090ae3:rocksdb/src/rocksdb CMAKE_BUILD_TYPE= Release CMAKE_ARGS= \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D CEPH_MAN_DIR:STRING=man \ -D WITH_LTTNG:BOOL=OFF \ -D WITH_BABELTRACE:BOOL=OFF \ -D WITH_KRBD:BOOL=OFF \ -D WITH_XFS:BOOL=OFF \ -D WITH_KVS:BOOL=OFF \ -D WITH_BLKID:BOOL=OFF \ -D WITH_SPDK:BOOL=OFF \ -D WITH_RDMA=OFF \ -D WITH_BLUESTORE:BOOL=OFF \ -D WITH_LIBCEPHFS:BOOL=OFF \ -D WITH_CEPHFS:BOOL=OFF \ -D WITH_EMBEDDED:BOOL=OFF \ -D WITH_SYSTEM_BOOST:BOOL=ON \ -D WITH_BOOST_CONTEXT:BOOL=OFF \ -D WITH_FUSE:BOOL=ON \ -D WITH_MANPAGE:BOOL=ON \ -D WITH_RADOSGW_BEAST_FRONTEND:BOOL=OFF \ -D WITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys USE_RC_SUBR= ceph USE_LDCONFIG= yes USERS= ceph GROUPS= ceph pre-configure: ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build ${CP} files/file-git_version ${WRKSRC}/src/.git_version post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw ${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/mds ${MKDIR} ${STAGEDIR}/var/lib/ceph/mon ${MKDIR} ${STAGEDIR}/var/lib/ceph/osd ${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr ${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp ${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw ${MKDIR} ${STAGEDIR}/var/log/ceph ${MKDIR} ${STAGEDIR}/var/run/ceph # Use the Ceph init.d script as the interface to regular - # starting and stopping deamons. rc.d work is done thru + # starting and stopping daemons. rc.d work is done thru # a separate rc.d/ceph script calling init-ceph again. ${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph # remove files not packaged ${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config ${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf ${RMDIR} ${STAGEDIR}${DOCSDIR} ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test* ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench ${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev # ceph-volume does not support ZFS ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-* ${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/ ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume ${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume* ${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd ${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd ${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d ${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample .include Index: head/net/frr3/files/frr.in =================================================================== --- head/net/frr3/files/frr.in (revision 495858) +++ head/net/frr3/files/frr.in (revision 495859) @@ -1,155 +1,155 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: frr # REQUIRE: netif routing # KEYWORD: nojailvnet shutdown # Add the following line to /etc/rc.conf to enable frr: # frr_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # frr_flags="" # frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" # frr_vysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing deamons a chance to catchup before +# If you want to give the routing daemons a chance to catchup before # continueing, set frr_wait_for to a "default" or certain prefix. # frr_wait_for="default" # Set the time limit for the wait. # frr_wait_seconds="90" # # If the frr daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: # frr_extralibs_path="/usr/local/lib ..." # # This RC script was adapted from the net/quagga port . /etc/rc.subr name=frr rcvar=$name_enable start_postcmd=start_postcmd stop_postcmd="rm -f $pidfile" configtest_cmd=check_config extra_commands=configtest command_args="-d" load_rc_config $name : ${frr_enable:="NO"} : ${frr_flags:=""} : ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} check_config() { echo "Checking $daemon.conf" # pimd doesn't support -C if [ "$daemon" = "pimd" ]; then echo "Ignored" else $command $daemon_flags -C result=$? if [ "$result" -eq "0" ]; then echo "OK" else echo "FAILED" exit fi fi } start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then return; fi if [ -n "${frr_wait_for}" ]; then echo Waiting for ${frr_wait_for} route... while [ ${waited_for} -lt ${frr_wait_seconds} ]; do /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; waited_for=$((waited_for+1)) sleep 1; done [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... fi } do_cmd() { local ret ret=0 frr_cmd=$1 for daemon in ${frr_daemons}; do command=%%PREFIX%%/sbin/${daemon} required_files=%%ETCDIR%%/${daemon}.conf pidfile=/var/run/frr/${daemon}.pid if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then check_config fi if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then continue fi if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} name=${daemon} _rc_restart_done=false run_rc_command "$1" || ret=1 done if checkyesno frr_vtysh_boot; then echo "Booting for integrated-vtysh-config..." %%PREFIX%%/bin/vtysh -b fi return ${ret} } frr_cmd=$1 case "$1" in force*) frr_cmd=${frr_cmd#force} ;; fast*) frr_cmd=${frr_cmd#fast} ;; esac shift if [ $# -ge 1 ]; then frr_daemons="$*" fi case "${frr_cmd}" in start|quietstart) if [ -n "${frr_extralibs_path}" ]; then /sbin/ldconfig -m ${frr_extralibs_path} fi # Why should I need to add this check ? checkyesno frr_enable && do_cmd "start" ;; stop) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" ;; restart) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" frr_daemons=$(reverse_list ${frr_daemons}) checkyesno frr_enable && do_cmd "start" ;; *) do_cmd "${frr_cmd}" ;; esac Index: head/net/frr4/files/frr.in =================================================================== --- head/net/frr4/files/frr.in (revision 495858) +++ head/net/frr4/files/frr.in (revision 495859) @@ -1,155 +1,155 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: frr # REQUIRE: netif routing # KEYWORD: nojailvnet shutdown # Add the following line to /etc/rc.conf to enable frr: # frr_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # frr_flags="" # frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" # frr_vysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing deamons a chance to catchup before +# If you want to give the routing daemons a chance to catchup before # continueing, set frr_wait_for to a "default" or certain prefix. # frr_wait_for="default" # Set the time limit for the wait. # frr_wait_seconds="90" # # If the frr daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: # frr_extralibs_path="/usr/local/lib ..." # # This RC script was adapted from the net/quagga port . /etc/rc.subr name=frr rcvar=$name_enable start_postcmd=start_postcmd stop_postcmd="rm -f $pidfile" configtest_cmd=check_config extra_commands=configtest command_args="-d" load_rc_config $name : ${frr_enable:="NO"} : ${frr_flags:=""} : ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} check_config() { echo "Checking $daemon.conf" # pimd doesn't support -C if [ "$daemon" = "pimd" ]; then echo "Ignored" else $command $daemon_flags -C result=$? if [ "$result" -eq "0" ]; then echo "OK" else echo "FAILED" exit fi fi } start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then return; fi if [ -n "${frr_wait_for}" ]; then echo Waiting for ${frr_wait_for} route... while [ ${waited_for} -lt ${frr_wait_seconds} ]; do /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; waited_for=$((waited_for+1)) sleep 1; done [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... fi } do_cmd() { local ret ret=0 frr_cmd=$1 for daemon in ${frr_daemons}; do command=%%PREFIX%%/sbin/${daemon} required_files=%%ETCDIR%%/${daemon}.conf pidfile=/var/run/frr/${daemon}.pid if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then check_config fi if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then continue fi if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} name=${daemon} _rc_restart_done=false run_rc_command "$1" || ret=1 done if checkyesno frr_vtysh_boot; then echo "Booting for integrated-vtysh-config..." %%PREFIX%%/bin/vtysh -b fi return ${ret} } frr_cmd=$1 case "$1" in force*) frr_cmd=${frr_cmd#force} ;; fast*) frr_cmd=${frr_cmd#fast} ;; esac shift if [ $# -ge 1 ]; then frr_daemons="$*" fi case "${frr_cmd}" in start|quietstart) if [ -n "${frr_extralibs_path}" ]; then /sbin/ldconfig -m ${frr_extralibs_path} fi # Why should I need to add this check ? checkyesno frr_enable && do_cmd "start" ;; stop) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" ;; restart) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" frr_daemons=$(reverse_list ${frr_daemons}) checkyesno frr_enable && do_cmd "start" ;; *) do_cmd "${frr_cmd}" ;; esac Index: head/net/frr5/files/frr.in =================================================================== --- head/net/frr5/files/frr.in (revision 495858) +++ head/net/frr5/files/frr.in (revision 495859) @@ -1,155 +1,155 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: frr # REQUIRE: netif routing # KEYWORD: nojailvnet shutdown # Add the following line to /etc/rc.conf to enable frr: # frr_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # frr_flags="" # frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" # frr_vysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing deamons a chance to catchup before +# If you want to give the routing daemons a chance to catchup before # continueing, set frr_wait_for to a "default" or certain prefix. # frr_wait_for="default" # Set the time limit for the wait. # frr_wait_seconds="90" # # If the frr daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: # frr_extralibs_path="/usr/local/lib ..." # # This RC script was adapted from the net/quagga port . /etc/rc.subr name=frr rcvar=$name_enable start_postcmd=start_postcmd stop_postcmd="rm -f $pidfile" configtest_cmd=check_config extra_commands=configtest command_args="-d" load_rc_config $name : ${frr_enable:="NO"} : ${frr_flags:=""} : ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} check_config() { echo "Checking $daemon.conf" # pimd doesn't support -C if [ "$daemon" = "pimd" ]; then echo "Ignored" else $command $daemon_flags -C result=$? if [ "$result" -eq "0" ]; then echo "OK" else echo "FAILED" exit fi fi } start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then return; fi if [ -n "${frr_wait_for}" ]; then echo Waiting for ${frr_wait_for} route... while [ ${waited_for} -lt ${frr_wait_seconds} ]; do /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; waited_for=$((waited_for+1)) sleep 1; done [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... fi } do_cmd() { local ret ret=0 frr_cmd=$1 for daemon in ${frr_daemons}; do command=%%PREFIX%%/sbin/${daemon} required_files=%%ETCDIR%%/${daemon}.conf pidfile=/var/run/frr/${daemon}.pid if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then check_config fi if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then continue fi if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} name=${daemon} _rc_restart_done=false run_rc_command "$1" || ret=1 done if checkyesno frr_vtysh_boot; then echo "Booting for integrated-vtysh-config..." %%PREFIX%%/bin/vtysh -b fi return ${ret} } frr_cmd=$1 case "$1" in force*) frr_cmd=${frr_cmd#force} ;; fast*) frr_cmd=${frr_cmd#fast} ;; esac shift if [ $# -ge 1 ]; then frr_daemons="$*" fi case "${frr_cmd}" in start|quietstart) if [ -n "${frr_extralibs_path}" ]; then /sbin/ldconfig -m ${frr_extralibs_path} fi # Why should I need to add this check ? checkyesno frr_enable && do_cmd "start" ;; stop) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" ;; restart) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" frr_daemons=$(reverse_list ${frr_daemons}) checkyesno frr_enable && do_cmd "start" ;; *) do_cmd "${frr_cmd}" ;; esac Index: head/net/frr6/files/frr.in =================================================================== --- head/net/frr6/files/frr.in (revision 495858) +++ head/net/frr6/files/frr.in (revision 495859) @@ -1,164 +1,164 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: frr # REQUIRE: netif routing # KEYWORD: nojailvnet shutdown # Add the following line to /etc/rc.conf to enable frr: # frr_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # frr_flags="" # frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd" # frr_vtysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing deamons a chance to catchup before +# If you want to give the routing daemons a chance to catchup before # continueing, set frr_wait_for to a "default" or certain prefix. # frr_wait_for="default" # Set the time limit for the wait. # frr_wait_seconds="90" # # If the frr daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: # frr_extralibs_path="/usr/local/lib ..." # # This RC script was adapted from the net/quagga port . /etc/rc.subr name=frr rcvar=$name_enable start_postcmd=start_postcmd stop_postcmd="rm -f $pidfile" configtest_cmd=check_config extra_commands=configtest command_args="-d" load_rc_config $name : ${frr_enable:="NO"} : ${frr_flags:=""} : ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld bfdd staticd"} : ${frr_vtysh_boot:="NO"} : ${frr_wait_for:=""} : ${frr_wait_seconds:="90"} check_config() { echo "Checking $daemon.conf" # pimd doesn't support -C if [ "$daemon" = "pimd" ]; then echo "Ignored" else $command $daemon_flags -C result=$? if [ "$result" -eq "0" ]; then echo "OK" else echo "FAILED" exit fi fi } start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then return; fi if [ -n "${frr_wait_for}" ]; then echo Waiting for ${frr_wait_for} route... while [ ${waited_for} -lt ${frr_wait_seconds} ]; do /sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break; waited_for=$((waited_for+1)) sleep 1; done [ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up... fi } do_cmd() { local ret ret=0 frr_cmd=$1 if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then echo "Checking intergrated config..." daemon="vtysh" daemon_flags="" command=%%PREFIX%%/bin/${daemon} check_config fi for daemon in ${frr_daemons}; do command=%%PREFIX%%/sbin/${daemon} pidfile=/var/run/frr/${daemon}.pid if ! checkyesno frr_vtysh_boot; then required_files=%%ETCDIR%%/${daemon}.conf if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then check_config fi if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then continue fi fi if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\} name=${daemon} _rc_restart_done=false run_rc_command "$1" || ret=1 done if checkyesno frr_vtysh_boot && ( [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ] ); then echo "Booting for integrated-vtysh-config..." %%PREFIX%%/bin/vtysh -b fi return ${ret} } frr_cmd=$1 case "$1" in force*) frr_cmd=${frr_cmd#force} ;; fast*) frr_cmd=${frr_cmd#fast} ;; esac shift if [ $# -ge 1 ]; then frr_daemons="$*" fi case "${frr_cmd}" in start|quietstart) if [ -n "${frr_extralibs_path}" ]; then /sbin/ldconfig -m ${frr_extralibs_path} fi # Why should I need to add this check ? checkyesno frr_enable && do_cmd "start" ;; stop) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" ;; restart) frr_daemons=$(reverse_list ${frr_daemons}) do_cmd "stop" frr_daemons=$(reverse_list ${frr_daemons}) checkyesno frr_enable && do_cmd "start" ;; *) do_cmd "${frr_cmd}" ;; esac Index: head/net/linuxigd/pkg-descr =================================================================== --- head/net/linuxigd/pkg-descr (revision 495858) +++ head/net/linuxigd/pkg-descr (revision 495859) @@ -1,6 +1,6 @@ -This project is a deamon that emulates Microsoft's Internet Connection +This project is a daemon that emulates Microsoft's Internet Connection Service (ICS). It implements the UPnP Internet Gateway Device specification (IGD) and allows UPnP aware clients, such as MSN Messenger to work properly from behind a NAT firewall. WWW: http://linux-igd.sourceforge.net/ Index: head/net/p5-File-RsyncP/pkg-descr =================================================================== --- head/net/p5-File-RsyncP/pkg-descr (revision 495858) +++ head/net/p5-File-RsyncP/pkg-descr (revision 495859) @@ -1,6 +1,6 @@ File::RsyncP is a perl implementation of an Rsync client. It is compatible with Rsync 2.5.5 (protocol version 26). It can send or receive files, either by running rsync on the remote machine, or -connecting to an rsyncd deamon on the remote machine. +connecting to an rsyncd daemon on the remote machine. WWW: https://metacpan.org/release/File-RsyncP Index: head/net/quagga/files/quagga.in =================================================================== --- head/net/quagga/files/quagga.in (revision 495858) +++ head/net/quagga/files/quagga.in (revision 495859) @@ -1,148 +1,148 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: quagga # REQUIRE: netif routing # KEYWORD: nojail shutdown # Add the following line to /etc/rc.conf to enable quagga: # quagga_enable="YES" # # You may also wish to use the following variables to fine-tune startup: # quagga_flags="" # quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd" # quagga_vysh_boot="YES" # Per daemon tuning may be done with daemon_name_flags # zebra_flags="-P 0" # bgpd_flags="-nrP 0" and so on -# If you want to give the routing deamons a chance to catchup before +# If you want to give the routing daemons a chance to catchup before # continueing, set quagga_wait_for to a "default" or certain prefix. # quagga_wait_for="default" # Set the time limit for the wait. # quagga_wait_seconds="90" # # If the quagga daemons require additional shared libraries to start, # use the following variable to run ldconfig(8) in advance: # quagga_extralibs_path="/usr/local/lib ..." # . /etc/rc.subr name=quagga rcvar=quagga_enable start_postcmd=start_postcmd stop_postcmd="rm -f $pidfile" configtest_cmd=check_config extra_commands=configtest command_args="-d" load_rc_config $name quagga_enable=${quagga_enable:-"NO"} quagga_flags=${quagga_flags:-""} quagga_daemons=${quagga_daemons:-"zebra ripd ripngd ospfd ospf6d bgpd isisd"} quagga_vtysh_boot=${quagga_vtysh_boot:-"NO"} quagga_wait_for=${quagga_wait_for:-""} quagga_wait_seconds=${quagga_wait_seconds:-"90"} check_config() { echo "Checking $daemon.conf" $command $daemon_flags -C result=$? if [ "$result" -eq "0" ]; then echo "OK" else echo "FAILED" exit fi } start_postcmd() { local waited_for waited_for=0 # Wait only when last daemon has started. if [ "${quagga_daemons}" = "${quagga_daemons% ${name}}" ]; then return; fi if [ -n "${quagga_wait_for}" ]; then echo Waiting for ${quagga_wait_for} route... while [ ${waited_for} -lt ${quagga_wait_seconds} ]; do /sbin/route -n get ${quagga_wait_for} >/dev/null 2>&1 && break; waited_for=$((${waited_for}+1)) sleep 1; done [ ${waited_for} -lt ${quagga_wait_seconds} ] || echo Giving up... fi } do_cmd() { local ret ret=0 for daemon in ${quagga_daemons}; do command=%%PREFIX%%/sbin/${daemon} required_files=%%SYSCONF_DIR%%/${daemon}.conf pidfile=%%LOCALSTATE_DIR%%/${daemon}.pid if [ ${quagga_cmd} = "restart" -o ${quagga_cmd} = "start" ]; then check_config fi if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then continue fi if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then continue fi eval flags=\$\{${daemon}_flags:-\"${quagga_flags}\"\} name=${daemon} _rc_restart_done=false run_rc_command "$1" || ret=1 done if checkyesno quagga_vtysh_boot; then echo "Booting for integrated-vtysh-config..." %%PREFIX%%/bin/vtysh -b fi return ${ret} } quagga_cmd=$1 case "$1" in force*) quagga_cmd=${quagga_cmd#force} ;; fast*) quagga_cmd=${quagga_cmd#fast} ;; esac shift if [ $# -ge 1 ]; then quagga_daemons="$*" fi case "${quagga_cmd}" in start) if [ -n "${quagga_extralibs_path}" ]; then /sbin/ldconfig -m ${quagga_extralibs_path} fi do_cmd "start" ;; stop) quagga_daemons=$(reverse_list ${quagga_daemons}) do_cmd "stop" ;; restart) quagga_daemons=$(reverse_list ${quagga_daemons}) do_cmd "stop" quagga_daemons=$(reverse_list ${quagga_daemons}) do_cmd "start" ;; *) do_cmd "${quagga_cmd}" ;; esac Index: head/net/widentd/pkg-descr =================================================================== --- head/net/widentd/pkg-descr (revision 495858) +++ head/net/widentd/pkg-descr (revision 495859) @@ -1,9 +1,9 @@ -widentd is a small ident/RFC1413 deamon which provides a fixed (and fake) +widentd is a small ident/RFC1413 daemon which provides a fixed (and fake) auth reply, regardless of the IP/port pair quoted. It's intended use is on firewalls, and NAT machines - where you may want to simply syphon off auth-requests from, for example, IRC servers. Author: Dirk-Willem van Gulik / dirkx@webweaving.org WWW: http://BSDforge.com/projects/net/widentd/ Index: head/sysutils/watchdog/pkg-descr =================================================================== --- head/sysutils/watchdog/pkg-descr (revision 495858) +++ head/sysutils/watchdog/pkg-descr (revision 495859) @@ -1,10 +1,10 @@ Watchdog daemon for the AMD Elan sc520 system-on-chip. -The watchdogd deamon runs in the background and will reset the hardware +The watchdogd daemon runs in the background and will reset the hardware watchdog timer of the elan-mmcr/soekris every 16 seconds. If this timer is not reset within 32 seconds thereafter the hardware will reboot. This software was specifically developed for http://www.soekris.com/ boards and for use within the http://www.wirelessleiden.nl/ project. WWW: http://www.webweaving.org/watchdog/