Index: head/sysutils/checkrestart/Makefile =================================================================== --- head/sysutils/checkrestart/Makefile (revision 530647) +++ head/sysutils/checkrestart/Makefile (revision 530648) @@ -1,31 +1,32 @@ # $FreeBSD$ PORTNAME= checkrestart DISTVERSIONPREFIX= v DISTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= tom@hur.st COMMENT= Find processes that need restarting after an upgrade LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt USE_GITHUB= yes GH_ACCOUNT= Freaky SUB_FILES= checkrestart PLIST_FILES= bin/checkrestart \ share/man/man1/checkrestart.1.gz \ - etc/periodic/daily/checkrestart + ${PERIODIC_SECURITY}/checkrestart -PERIODIC_DAILY= etc/periodic/daily +PERIODIC_SECURITY= etc/periodic/security/ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/checkrestart ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/checkrestart.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1 - @${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DAILY} - ${INSTALL_SCRIPT} ${WRKDIR}/checkrestart ${STAGEDIR}${PREFIX}/${PERIODIC_DAILY} + @${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_SECURITY} + ${INSTALL_SCRIPT} ${WRKDIR}/checkrestart ${STAGEDIR}${PREFIX}/${PERIODIC_SECURITY} .include Index: head/sysutils/checkrestart/files/checkrestart.in =================================================================== --- head/sysutils/checkrestart/files/checkrestart.in (revision 530647) +++ head/sysutils/checkrestart/files/checkrestart.in (revision 530648) @@ -1,70 +1,58 @@ #!/bin/sh # $FreeBSD$ if [ -r /etc/defaults/periodic.conf ]; then . /etc/defaults/periodic.conf source_periodic_confs fi -: "${daily_checkrestart_enable:=NO}" -: "${daily_checkrestart_weekdays:=1234567}" # Days of the week to run, Monday=1 -: "${daily_checkrestart_users:=}" # User names or IDs to check -: "${daily_checkrestart_jails:=}" # Jail names or IDs to check -: "${daily_checkrestart_procs:=}" # Process names or IDs to check +: "${security_checkrestart_enable:=NO}" +: "${security_checkrestart_period:=DAILY}" +: "${security_checkrestart_users:=}" # User names or IDs to check +: "${security_checkrestart_jails:=}" # Jail names or IDs to check +: "${security_checkrestart_procs:=}" # Process names or IDs to check -checkrestartcmd=/usr/local/bin/checkrestart +checkrestartcmd=%%PREFIX%%/bin/checkrestart hflag="" rc=0 export COLUMNS=80 checkrestart() { local result - result="$(${checkrestartcmd} ${hflag} "$@" -- ${daily_checkrestart_procs} 2>&1)" + result="$(${checkrestartcmd} ${hflag} "$@" -- ${security_checkrestart_procs} 2>&1)" if [ "$result" ]; then echo "${result}" rc=3 fi hflag="-H" } checkrestart_each_user() { - if [ -n "${daily_checkrestart_users}" ]; then - for user in ${daily_checkrestart_users}; do + if [ -n "${security_checkrestart_users}" ]; then + for user in ${security_checkrestart_users}; do checkrestart -u "${user}" "$@" done else checkrestart "$@" fi } checkrestart_start() { - if [ -n "${daily_checkrestart_jails}" ]; then - for jail in ${daily_checkrestart_jails}; do + if [ -n "${security_checkrestart_jails}" ]; then + for jail in ${security_checkrestart_jails}; do checkrestart_each_user -j "${jail}" done else checkrestart_each_user fi } -checkday() { - if echo "${daily_checkrestart_weekdays}" | grep -vq '^[1-7, ]*$'; then - echo "daily_checkrestart_weekdays must have values 1-7" - exit 2 - fi - - echo "${daily_checkrestart_weekdays}" | grep -Fq "$(date +%u)" -} - -case "${daily_checkrestart_enable}" in - [Yy][Ee][Ss]) - if checkday; then - echo - echo 'Checking for stale processes:' - checkrestart_start - fi - ;; -esac +if check_yesno_period security_checkrestart_enable +then + echo + echo 'Checking for stale processes:' + checkrestart_start +fi exit $rc Index: head/sysutils/checkrestart/pkg-message =================================================================== --- head/sysutils/checkrestart/pkg-message (revision 530647) +++ head/sysutils/checkrestart/pkg-message (revision 530648) @@ -1,16 +1,36 @@ [ { type: install, message: <