From owner-svn-ports-head@freebsd.org Sun Sep 8 19:37:29 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4DE22DE4CD; Sun, 8 Sep 2019 19:37:29 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46RM551LxYz3yrJ; Sun, 8 Sep 2019 19:37:29 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC2F11E3E; Sun, 8 Sep 2019 19:37:28 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x88JbSFR097997; Sun, 8 Sep 2019 19:37:28 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x88JbRsp097991; Sun, 8 Sep 2019 19:37:27 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201909081937.x88JbRsp097991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 8 Sep 2019 19:37:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511592 - in head/security/clamav-unofficial-sigs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/security/clamav-unofficial-sigs: . files X-SVN-Commit-Revision: 511592 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2019 19:37:29 -0000 Author: pi Date: Sun Sep 8 19:37:27 2019 New Revision: 511592 URL: https://svnweb.freebsd.org/changeset/ports/511592 Log: security/clamav-unofficial-sigs: upgrade 5.6.2 -> 6.1.1 - maintainer returns port to the pool PR: Marko Njezic (maintainer) Changelog: https://github.com/extremeshok/clamav-unofficial-sigs/releases Added: head/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf (contents, props changed) head/security/clamav-unofficial-sigs/files/patch-config_user.conf (contents, props changed) Deleted: head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Modified: head/security/clamav-unofficial-sigs/Makefile head/security/clamav-unofficial-sigs/distinfo head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh head/security/clamav-unofficial-sigs/files/patch-config_master.conf head/security/clamav-unofficial-sigs/pkg-plist Modified: head/security/clamav-unofficial-sigs/Makefile ============================================================================== --- head/security/clamav-unofficial-sigs/Makefile Sun Sep 8 19:32:02 2019 (r511591) +++ head/security/clamav-unofficial-sigs/Makefile Sun Sep 8 19:37:27 2019 (r511592) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= clamav-unofficial-sigs -PORTVERSION= 5.6.2 -PORTREVISION= 1 +PORTVERSION= 6.1.1 CATEGORIES= security -MAINTAINER= sf@maxempire.com +MAINTAINER= ports@FreeBSD.org COMMENT= Update script for third-party ClamAV databases LICENSE= BSD3CLAUSE @@ -45,10 +44,10 @@ do-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/master.conf ${STAGEDIR}${ETCDIR}/master.conf.sample - ${INSTALL_DATA} ${WRKSRC}/config/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample + ${INSTALL_DATA} ${WRKSRC}/config/os/os.freebsd.conf ${STAGEDIR}${ETCDIR}/os.conf.sample ${INSTALL_DATA} ${WRKSRC}/config/user.conf ${STAGEDIR}${ETCDIR}/user.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} INSTALL LICENSE README.md ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} INSTALL.md LICENSE README.md ${STAGEDIR}${DOCSDIR}) .include Modified: head/security/clamav-unofficial-sigs/distinfo ============================================================================== --- head/security/clamav-unofficial-sigs/distinfo Sun Sep 8 19:32:02 2019 (r511591) +++ head/security/clamav-unofficial-sigs/distinfo Sun Sep 8 19:37:27 2019 (r511592) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522164679 -SHA256 (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 233404d767fcb7d2b82defef831d584cbbcc7105f6bbc586d69a0a960bc0d4df -SIZE (extremeshok-clamav-unofficial-sigs-5.6.2_GH0.tar.gz) = 50931 +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 Modified: head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sun Sep 8 19:32:02 2019 (r511591) +++ head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sun Sep 8 19:37:27 2019 (r511592) @@ -1,24 +1,50 @@ ---- clamav-unofficial-sigs.sh.orig 2018-11-24 16:35:07 UTC +--- clamav-unofficial-sigs.sh.orig 2019-09-02 22:41:48 UTC +++ clamav-unofficial-sigs.sh -@@ -1290,7 +1290,7 @@ minimum_required_config_version="72" - minimum_yara_clamav_version="0.99" - - # Default config files --config_dir="/etc/clamav-unofficial-sigs" -+config_dir="%%PREFIX%%/etc/clamav-unofficial-sigs" - config_files=( "$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf" ) - - # Initialise -@@ -1302,6 +1302,8 @@ force_updates="no" +@@ -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" - # Solaris which function returns garbage when the program is not found - # only define the new which function if running under Solaris -@@ -1455,7 +1457,7 @@ for config_file in "${config_files[@]}" +- +-# 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 @@ -27,7 +53,7 @@ fi #fix eval of | -@@ -1470,7 +1472,7 @@ for config_file in "${config_files[@]}" +@@ -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 " @@ -35,27 +61,32 @@ + 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 \"\"" "=" -@@ -2131,20 +2133,11 @@ if [ "$sanesecurity_enabled" == "yes" ] + 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..." - -- sanesecurity_mirror_ips="$(dig +ignore +short "$sanesecurity_url")" +- # 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 -- sanesecurity_mirror_ips="$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}')" +- # 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:]]//') ++ 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="" -- sanesecurity_mirror_name="$(dig +short -x "$sanesecurity_mirror_ip" | command sed 's/\.$//')" +- # 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 -- sanesecurity_mirror_name="$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}')" +- # 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" + xshok_pretty_echo_and_log "Sanesecurity mirror site used: ${sanesecurity_mirror_site_info}" # shellcheck disable=SC2086 Modified: head/security/clamav-unofficial-sigs/files/patch-config_master.conf ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-config_master.conf Sun Sep 8 19:32:02 2019 (r511591) +++ head/security/clamav-unofficial-sigs/files/patch-config_master.conf Sun Sep 8 19:37:27 2019 (r511592) @@ -1,4 +1,4 @@ ---- config/master.conf.orig 2017-03-18 11:57:29 UTC +--- config/master.conf.orig 2019-09-02 22:41:48 UTC +++ config/master.conf @@ -63,8 +63,8 @@ clamd_reload_opt="clamdscan --reload" work_dir="/var/lib/clamav-unofficial-sigs" #Top level working directory @@ -9,14 +9,14 @@ +logging_enabled="no" +log_file_path="/var/log" log_file_name="clamav-unofficial-sigs.log" + ## Use a program to log messages + #log_pipe_cmd="/usr/bin/logger -it 'clamav-unofficial-sigs'" +@@ -487,8 +487,6 @@ selinux_fixes="no" # Default is "no" ignore ssl errors + #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 - -@@ -125,7 +125,7 @@ yararulesproject_enabled="yes" # Yara- - additional_enabled="yes" # Additional Databases - - ## Disabling this will also cause the yararulesproject to be disabled. --enable_yararules="yes" #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99 -+enable_yararules="no" #Enables yararules in the various databases, automatically disabled if clamav is older than 0.99 - - # ======================== - # eXtremeSHOK Database format + # Custom Cron install settings, these are detected and only used if you want to override + # the automatic detection and generation of the values when not set, this is mainly to aid package maintainers Added: head/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav-unofficial-sigs/files/patch-config_os_os.freebsd.conf Sun Sep 8 19:37:27 2019 (r511592) @@ -0,0 +1,11 @@ +--- config/os/os.freebsd.conf.orig 2019-09-02 22:41:48 UTC ++++ config/os/os.freebsd.conf +@@ -29,8 +29,6 @@ clamd_pid="/var/run/clamav/clamd.pid" + + work_dir="/var/db/clamav-unofficial-sigs" + +-log_file_path="/var/log/clamav" +- + clamd_restart_opt="service clamav-clamd reload" + + #clamd_socket="/var/run/clamav/clamd.sock" Added: head/security/clamav-unofficial-sigs/files/patch-config_user.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav-unofficial-sigs/files/patch-config_user.conf Sun Sep 8 19:37:27 2019 (r511592) @@ -0,0 +1,18 @@ +--- config/user.conf.orig 2019-09-02 22:41:48 UTC ++++ config/user.conf +@@ -49,14 +49,12 @@ + #) #END ADDITIONAL DATABASES + + # Uncomment the following line to enable the script +-user_configuration_complete="yes" ++#user_configuration_complete="yes" + + # 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 + + # https://eXtremeSHOK.com ###################################################### Modified: head/security/clamav-unofficial-sigs/pkg-plist ============================================================================== --- head/security/clamav-unofficial-sigs/pkg-plist Sun Sep 8 19:32:02 2019 (r511591) +++ head/security/clamav-unofficial-sigs/pkg-plist Sun Sep 8 19:37:27 2019 (r511592) @@ -3,6 +3,6 @@ bin/clamav-unofficial-sigs.sh @sample %%ETCDIR%%/os.conf.sample @sample %%ETCDIR%%/user.conf.sample man/man8/clamav-unofficial-sigs.8.gz -%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md