Attachment 216421 Details for Bug 247953 – Patch to fix the problem

[patch] Patch to fix the problem

pkg-audit.diff (text/plain), 1.47 KB, created by frank on 2020-07-13 15:34:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: frank

Created: 2020-07-13 15:34:15 UTC

Size: 1.47 KB

patch

obsolete

>--- /usr/local/etc/periodic/security/410.pkg-audit	2020-06-23 03:19:37.000000000 +0200
>+++ ./410.pkg-audit	2020-07-13 17:19:05.029464000 +0200
>@@ -43,6 +43,8 @@
> : ${security_status_pkgaudit_chroots=$pkg_chroots}
> : ${security_status_pkgaudit_jails=$pkg_jails}
> : ${security_status_pkgaudit_expiry:=2}
>+: ${security_status_pkgaudit_expiration:=YES}
>+: ${security_status_pkgaudit_deprecation:=YES}
> 
> security_daily_compat_var security_status_pkgaudit_enable
> security_daily_compat_var security_status_pkgaudit_quiet
>@@ -83,23 +85,37 @@
> expiration_pkgs() {
> 	local pkgargs="$1"
> 
>-	output=$(${pkgcmd} ${pkgargs} annotate -a -S expiration_date)
>+	case "$security_status_pkgaudit_expiration" in
>+ 	    [Yy][Ee][Ss])
> 
>-	if [ -n "${output}" ]; then
>-		echo "${output}"
>-		return 3
>-	fi
>+		output=$(${pkgcmd} ${pkgargs} annotate -a -S expiration_date)
>+
>+		if [ -n "${output}" ]; then
>+			echo "${output}"
>+			return 3
>+		fi;;
>+
>+	    *)
>+		return 0;;
>+	esac
> }
> 
> deprecation_pkgs() {
> 	local pkgargs="$1"
> 
>-	output=$(${pkgcmd} ${pkgargs} annotate -a -S deprecated)
>+	case "$security_status_pkgaudit_deprecation" in
>+ 	    [Yy][Ee][Ss])
> 
>-	if [ -n "${output}" ]; then
>-		echo "${output}"
>+	    output=$(${pkgcmd} ${pkgargs} annotate -a -S deprecated)
>+
>+	    if [ -n "${output}" ]; then
>+	  	    echo "${output}"
> 		return 3
>-	fi
>+	    fi;;
>+	    
>+	    *)
>+	    	return 0;;
>+	    esac
> }
> 
> # Use $pkg_chroots to provide a default list of chroots, and

Actions: View | Diff

Attachments on bug 247953: 216421