Attachment 211062 Details for Bug 243556 – Proposed patch to update port to upstream 7.0.1

[patch] Proposed patch to update port to upstream 7.0.1

clamav-unofficial-sigs-7.0.1.diff (text/plain), 7.59 KB, created by Peter Putzer on 2020-01-26 13:37:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Putzer

Created: 2020-01-26 13:37:38 UTC

Size: 7.59 KB

patch

obsolete

>diff -urw clamav-unofficial-sigs.orig/Makefile clamav-unofficial-sigs/Makefile
>--- clamav-unofficial-sigs.orig/Makefile	2019-09-08 21:37:27.000000000 +0200
>+++ clamav-unofficial-sigs/Makefile	2020-01-26 14:06:34.464583000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/security/clamav-unofficial-sigs/Makefile 511592 2019-09-08 19:37:27Z pi $
> 
> PORTNAME=	clamav-unofficial-sigs
>-PORTVERSION=	6.1.1
>+PORTVERSION=	7.0.1
> CATEGORIES=	security
> 
> MAINTAINER=	ports@FreeBSD.org
>diff -urw clamav-unofficial-sigs.orig/distinfo clamav-unofficial-sigs/distinfo
>--- clamav-unofficial-sigs.orig/distinfo	2019-09-08 21:37:27.000000000 +0200
>+++ clamav-unofficial-sigs/distinfo	2020-01-26 14:06:37.344629000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1567631464
>-SHA256 (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = bac14809c8106ebae6c13f4db1c330a75f0a284924b3ab3668c49e30619b299f
>-SIZE (extremeshok-clamav-unofficial-sigs-6.1.1_GH0.tar.gz) = 55340
>+TIMESTAMP = 1580043997
>+SHA256 (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 20e1bd6da863513ec1dc42c3f498ca1dfe1c1845110442c2e4595df6ab8341ed
>+SIZE (extremeshok-clamav-unofficial-sigs-7.0.1_GH0.tar.gz) = 59517
>diff -urw clamav-unofficial-sigs.orig/files/patch-clamav-unofficial-sigs.sh clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh
>--- clamav-unofficial-sigs.orig/files/patch-clamav-unofficial-sigs.sh	2019-09-08 21:37:27.000000000 +0200
>+++ clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh	2020-01-26 14:25:30.045066000 +0100
>@@ -1,92 +0,0 @@
>---- clamav-unofficial-sigs.sh.orig	2019-09-02 22:41:48 UTC
>-+++ clamav-unofficial-sigs.sh
>-@@ -1422,25 +1422,14 @@ force_wget="no"
>- enable_log="no"
>- custom_config="no"
>- we_have_a_config="0"
>-+pkg_mgr="FreeBSD ports"
>-+pkg_rm="pkg delete"
>- 
>--
>--# Attempt to scan for a valid config dir
>--if [ -f "/etc/clamav-unofficial-sigs/master.conf" ] ; then
>--  config_dir="/etc/clamav-unofficial-sigs"
>--elif [ -f "/usr/local/etc/clamav-unofficial-sigs/master.conf" ] ; then
>--  config_dir="/usr/local/etc/clamav-unofficial-sigs/"
>--elif [ -f "/opt/zimbra/config/clamav-unofficial-sigs/master.conf" ] ; then
>--  config_dir="/opt/zimbra/config/clamav-unofficial-sigs/"
>--else
>--  xshok_pretty_echo_and_log "ERROR: config_dir (/etc/clamav-unofficial-sigs/master.conf) could not be found"
>--  exit 1
>--fi
>- # Default config files
>-+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs"
>- config_files=("${config_dir}/master.conf")
>--#find the a suitable os.conf or os.*.conf file
>--config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
>--if [ -r "${config_file}" ]; then
>--	config_files+=( "${config_file}" )
>-+if [ -r "${config_dir}/os.conf" ] ; then
>-+	config_files+=( "${config_dir}/os.conf" )
>- fi
>- if [ -r "${config_dir}/user.conf" ] ; then
>- 	config_files+=( "${config_dir}/user.conf" )
>-@@ -1576,10 +1565,8 @@ if [ "$custom_config" != "no" ] ; then
>- 		else
>- 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/master.conf not found"
>- 		fi
>--		#find the a suitable os.conf or os.*.conf file
>--		config_file="$(find "$config_dir" -type f -iname "os.conf" -o -iname "os.*.conf" | tail -n1)"
>--		if [ -r "${config_file}" ] ; then
>--			config_files+=( "${config_file}" )
>-+		if [ -r "${config_dir}/os.conf" ] ; then
>-+			config_files+=( "${config_dir}/os.conf" )
>- 		else
>- 			xshok_pretty_echo_and_log "WARNING: ${config_dir}/os.conf not found"
>- 		fi
>-@@ -1625,7 +1612,7 @@ for config_file in "${config_files[@]}" ; do
>-       # Delete both trailing and leading whitespace
>-       # Delete all trailing whitespace
>-       # Delete all empty lines
>--      clean_config="$(command sed -e '/^#.*/d' -e 's/[[:space:]]#.*//' -e 's/#[[:space:]].*//' -e 's/^[ \t]*//;s/[ \t]*$//' -e '/^\s*$/d' "$config_file")"
>-+      clean_config="$(command sed -e '/^#.*/d' -e 's/[[:space:]]#.*//' -e 's/#[[:space:]].*//' -e 's/^[[:blank:]]*//;s/[[:blank:]]*$//' -e '/^[[:space:]]*$/d' "$config_file")"
>-     fi
>- 
>-     #fix eval of |
>-@@ -1640,7 +1627,7 @@ for config_file in "${config_files[@]}" ; do
>-     fi
>- 
>-     # Check there is an = for every set of "" optional whitespace \s* between = and "
>--    config_check_vars="$(echo "$clean_config" | $grep_bin -c '=\s*\"' )"
>-+    config_check_vars="$(echo "$clean_config" | $grep_bin -c '=[[:space:]]*\"' )"
>- 
>-     if [ $(( ${#config_check} / 2 )) -ne "$config_check_vars" ] ; then
>-       xshok_pretty_echo_and_log "ERROR: Your configuration has errors, every = requires a pair of \"\""
>-@@ -2316,24 +2303,12 @@ if [ "$sanesecurity_enabled" == "yes" ] ; then
>-         echo "$current_time" > "${work_dir_work_configs}/last-ss-update.txt"
>-         xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "="
>-         xshok_pretty_echo_and_log "Checking for Sanesecurity updates..."
>--				# shellcheck disable=SC2086
>--        sanesecurity_mirror_ips="$(dig $dig_proxy +ignore +short "$sanesecurity_url")"
>--        # Add fallback to host if dig returns no records
>--        if [ ${#sanesecurity_mirror_ips} -lt 1 ] ; then
>--					# shellcheck disable=SC2086
>--          sanesecurity_mirror_ips="$(host $host_proxy -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address $[^ ]*$.*/\1/;p;}')"
>--        fi
>- 
>-+        sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*[[:space:]]//')
>-+
>-         if [ ${#sanesecurity_mirror_ips} -ge 1 ] ; then
>-           for sanesecurity_mirror_ip in $sanesecurity_mirror_ips ; do
>--            sanesecurity_mirror_name=""
>--						# shellcheck disable=SC2086
>--            sanesecurity_mirror_name="$(dig $dig_proxy +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')"
>--            # Add fallback to host if dig returns no records
>--            if [ -z "$sanesecurity_mirror_name" ] ; then
>--							# shellcheck disable=SC2086
>--              sanesecurity_mirror_name="$(host $host_proxy "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer $[^ ]*$.*\.$/\1/;p;}')"
>--            fi
>-+            sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*[[:space:]]//' | sed 's/\.$//')
>-             sanesecurity_mirror_site_info="$sanesecurity_mirror_name $sanesecurity_mirror_ip"
>-             xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}"
>-             # shellcheck disable=SC2086
>diff -urw clamav-unofficial-sigs.orig/files/patch-config_user.conf clamav-unofficial-sigs/files/patch-config_user.conf
>--- clamav-unofficial-sigs.orig/files/patch-config_user.conf	2019-09-08 21:37:27.000000000 +0200
>+++ clamav-unofficial-sigs/files/patch-config_user.conf	2020-01-26 14:32:45.760970000 +0100
>@@ -1,6 +1,6 @@
>---- config/user.conf.orig	2019-09-02 22:41:48 UTC
>-+++ config/user.conf
>-@@ -49,14 +49,12 @@
>+--- config/user.conf.orig	2020-01-26 14:32:25.762181000 +0100
>++++ config/user.conf	2020-01-26 14:32:41.921181000 +0100
>+@@ -54,13 +54,11 @@
>  #) #END ADDITIONAL DATABASES
>  
>  # Uncomment the following line to enable the script
>@@ -9,10 +9,9 @@
>  
>  # Proxy Support
>  # If necessary to proxy database downloads, define the rsync, curl, wget, dig, hosr proxy settings here.
>- #rsync_proxy="username:password@proxy_host:proxy_port"
>  #curl_proxy="--proxy http://username:password@proxy_host:proxy_port"
>- #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
> -#dig_proxy="@proxy_host -p proxy_host:proxy_port"
> -#host_proxy="@proxy_host" #does not support port
>+ #rsync_proxy="username:password@proxy_host:proxy_port"
>+ #wget_proxy="-e http_proxy=http://username:password@proxy_host:proxy_port -e https_proxy=https://username:password@proxy_host:proxy_port"
>  
>- # https://eXtremeSHOK.com ######################################################

Actions: View | Diff

Attachments on bug 243556: 211062 | 211063 | 211355 | 211485 | 211502 | 211505