From owner-svn-ports-all@freebsd.org Sun Jun 5 08:42:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65DFBB6AAD2; Sun, 5 Jun 2016 08:42:36 +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 mx1.freebsd.org (Postfix) with ESMTPS id 42AD3165A; Sun, 5 Jun 2016 08:42:36 +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 u558gZK3099701; Sun, 5 Jun 2016 08:42:35 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u558gYqJ099693; Sun, 5 Jun 2016 08:42:34 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201606050842.u558gYqJ099693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 5 Jun 2016 08:42:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416386 - in head/security/clamav-unofficial-sigs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2016 08:42:36 -0000 Author: pi Date: Sun Jun 5 08:42:34 2016 New Revision: 416386 URL: https://svnweb.freebsd.org/changeset/ports/416386 Log: security/clamav-unofficial-sigs: 5.0.5 -> 5.3.2 Changes: https://github.com/extremeshok/clamav-unofficial-sigs/releases PR: 209894 Submitted by: uros.gruber@gmail.com, Marko Njezic (maintainer) Added: head/security/clamav-unofficial-sigs/files/manpage.conf (contents, props changed) Deleted: head/security/clamav-unofficial-sigs/files/patch-cron.d_clamav-unofficial-sigs head/security/clamav-unofficial-sigs/files/patch-logrotate.d_clamav-unofficial-sigs 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/files/patch-config_os.freebsd.conf head/security/clamav-unofficial-sigs/files/pkg-message.in head/security/clamav-unofficial-sigs/pkg-plist Modified: head/security/clamav-unofficial-sigs/Makefile ============================================================================== --- head/security/clamav-unofficial-sigs/Makefile Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/Makefile Sun Jun 5 08:42:34 2016 (r416386) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= clamav-unofficial-sigs -PORTVERSION= 5.0.5 +PORTVERSION= 5.3.2 CATEGORIES= security MAINTAINER= sf@maxempire.com @@ -11,11 +11,13 @@ COMMENT= Update script for third-party C LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= clamscan:security/clamav \ +COMMON_DEPENDS= clamscan:security/clamav \ rsync:net/rsync \ curl:ftp/curl \ gpg:security/gnupg \ bash:shells/bash +BUILD_DEPENDS= ${COMMON_DEPENDS} +RUN_DEPENDS= ${COMMON_DEPENDS} USE_GITHUB= yes GH_ACCOUNT= extremeshok @@ -23,14 +25,19 @@ GH_ACCOUNT= extremeshok USES= perl5 shebangfix SHEBANG_FILES= clamav-unofficial-sigs.sh USE_PERL5= run -NO_BUILD= yes SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh ${WRKSRC}/cron.d/clamav-unofficial-sigs + @${CP} ${FILESDIR}/manpage.conf ${WRKSRC} + @${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' ${WRKSRC}/manpage.conf + + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/clamav-unofficial-sigs.sh + +do-build: + (cd ${WRKSRC} && ${LOCALBASE}/bin/bash ./clamav-unofficial-sigs.sh -c manpage.conf --install-man) do-install: ${INSTALL_SCRIPT} ${WRKSRC}/clamav-unofficial-sigs.sh ${STAGEDIR}${PREFIX}/bin @@ -44,8 +51,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} INSTALL LICENSE README.md ${STAGEDIR}${DOCSDIR}) - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/cron.d/clamav-unofficial-sigs ${STAGEDIR}${EXAMPLESDIR}/clamav-unofficial-sigs-cron - ${INSTALL_DATA} ${WRKSRC}/logrotate.d/clamav-unofficial-sigs ${STAGEDIR}${EXAMPLESDIR}/clamav-unofficial-sigs-logrotate - .include Modified: head/security/clamav-unofficial-sigs/distinfo ============================================================================== --- head/security/clamav-unofficial-sigs/distinfo Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/distinfo Sun Jun 5 08:42:34 2016 (r416386) @@ -1,2 +1,3 @@ -SHA256 (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 2aeba3f281511f5acc1d79b5f3460440cd579c75ae23b28d1dabde8321a87570 -SIZE (extremeshok-clamav-unofficial-sigs-5.0.5_GH0.tar.gz) = 34027 +TIMESTAMP = 1464946787 +SHA256 (extremeshok-clamav-unofficial-sigs-5.3.2_GH0.tar.gz) = 3abe1c22133d879318cebc18d3224a820ea1747524425d4a2efd337749596589 +SIZE (extremeshok-clamav-unofficial-sigs-5.3.2_GH0.tar.gz) = 113714 Added: head/security/clamav-unofficial-sigs/files/manpage.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav-unofficial-sigs/files/manpage.conf Sun Jun 5 08:42:34 2016 (r416386) @@ -0,0 +1,10 @@ +# Dummy configuration file used just for auto-generating manual page +logging_enabled="no" +config_version="999" +user_configuration_complete="yes" +work_dir="/var/db/clamav-unofficial-sigs" +man_dir="%%WRKSRC%%" +enable_locking="no" +setmode="no" +clam_user="nobody" +clam_group="nobody" Modified: head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/files/patch-clamav-unofficial-sigs.sh Sun Jun 5 08:42:34 2016 (r416386) @@ -1,7 +1,16 @@ ---- clamav-unofficial-sigs.sh.orig 2016-04-02 05:47:26 UTC +--- clamav-unofficial-sigs.sh.orig 2016-06-03 09:51:21 UTC +++ clamav-unofficial-sigs.sh -@@ -187,7 +187,7 @@ script_version_date="02 April 2016" - minimum_required_config_version="56" +@@ -753,6 +753,8 @@ function make_signature_database_from_as + #Remove the clamav-unofficial-sigs script + function remove_script () { + echo "" ++ pkg_mgr="FreeBSD ports" ++ pkg_rm="pkg delete" + if [ -n "$pkg_mgr" ] && [ -n "$pkg_rm" ] ; then + echo "This script (clamav-unofficial-sigs) was installed on the system via '$pkg_mgr'" + echo "use '$pkg_rm' to remove the script and all of its associated files and databases from the system." +@@ -1151,7 +1153,7 @@ minimum_required_config_version="65" + minimum_yara_clamav_version="0.99" #default config files -config_dir="/etc/clamav-unofficial-sigs" @@ -9,37 +18,26 @@ config_files=("$config_dir/master.conf" "$config_dir/os.conf" "$config_dir/user.conf") #Initialise -@@ -627,6 +627,8 @@ make_signature_database_from_ascii_file - #Remove the clamav-unofficial-sigs script - remove_script () { - echo "" -+ pkg_mgr="FreeBSD ports" -+ pkg_rm="pkg delete" - if [ -n "$pkg_mgr" -a -n "$pkg_rm" ] ; then - echo " This script (clamav-unofficial-sigs) was installed on the system" - echo " via '$pkg_mgr', use '$pkg_rm' to remove the script" -@@ -1175,22 +1177,13 @@ if [ "$sanesecurity_enabled" == "yes" ] - db_file="" - xshok_pretty_echo_and_log "Sanesecurity Database & GPG Signature File Updates" "=" - -- sanesecurity_mirror_ips=`dig +ignore +short $sanesecurity_url` -- #add fallback to host if dig returns no records -- if [ `xshok_array_count "$sanesecurity_mirror_ips"` -lt 1 ] ; then -- sanesecurity_mirror_ips=`host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p}'` -- fi -+ sanesecurity_mirror_ips=`host $sanesecurity_url | sed 's/.*\s//'` - - if [ `xshok_array_count "$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/\.$//'` -- #add fallback to host if dig returns no records -- if [ "$sanesecurity_mirror_name" == "" ] ; then -- sanesecurity_mirror_name=`host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*/\1/;p}'` -- fi -+ sanesecurity_mirror_name=`host $sanesecurity_mirror_ip | sed 's/.*\s//' | 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" - $rsync_bin $rsync_output_level $no_motd --files-from=$sanesecurity_include_dbs -ctuz $connect_timeout --timeout="$rsync_max_time" --stats rsync://$sanesecurity_mirror_ip/sanesecurity $sanesecurity_dir 2>/dev/null +@@ -1879,20 +1881,11 @@ if [ "$sanesecurity_enabled" == "yes" ] + 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") +- #add fallback to host if dig returns no records +- if [ "$(xshok_array_count "$sanesecurity_mirror_ips")" -lt 1 ] ; then +- sanesecurity_mirror_ips=$(host -t A "$sanesecurity_url" | sed -n '/has address/{s/.*address \([^ ]*\).*/\1/;p;}') +- fi ++ sanesecurity_mirror_ips=$(host "$sanesecurity_url" | sed 's/.*\s//') + + if [ "$(xshok_array_count "$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/\.$//') +- #add fallback to host if dig returns no records +- if [ "$sanesecurity_mirror_name" == "" ] ; then +- sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed -n '/name pointer/{s/.*pointer \([^ ]*\).*\.$/\1/;p;}') +- fi ++ sanesecurity_mirror_name=$(host "$sanesecurity_mirror_ip" | sed 's/.*\s//' | 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" + $rsync_bin $rsync_output_level $no_motd --files-from="$sanesecurity_include_dbs" -ctuz $connect_timeout --timeout="$rsync_max_time" "rsync://$sanesecurity_mirror_ip/sanesecurity" "$work_dir_sanesecurity" 2>/dev/null Modified: head/security/clamav-unofficial-sigs/files/patch-config_master.conf ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-config_master.conf Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/files/patch-config_master.conf Sun Jun 5 08:42:34 2016 (r416386) @@ -1,4 +1,4 @@ ---- config/master.conf.orig 2016-03-31 01:16:02 UTC +--- config/master.conf.orig 2016-05-23 23:38:56 UTC +++ config/master.conf @@ -58,8 +58,8 @@ reload_dbs="yes" work_dir="/var/lib/clamav-unofficial-sigs" #Top level working directory @@ -11,3 +11,12 @@ log_file_name="clamav-unofficial-sigs.log" +@@ -120,7 +120,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 Modified: head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf ============================================================================== --- head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/files/patch-config_os.freebsd.conf Sun Jun 5 08:42:34 2016 (r416386) @@ -1,6 +1,6 @@ ---- config/os.freebsd.conf.orig 2016-04-01 23:10:24 UTC +--- config/os.freebsd.conf.orig 2016-05-23 23:38:56 UTC +++ config/os.freebsd.conf -@@ -32,13 +32,8 @@ clamd_pid="/var/run/clamav/clamd.pid" +@@ -33,8 +33,6 @@ clamd_pid="/var/run/clamav/clamd.pid" work_dir="/var/db/clamav-unofficial-sigs" @@ -9,8 +9,3 @@ clamd_restart_opt="service clamav-clamd reload" #clamd_socket="/var/run/clamav/clamd.sock" - --pkg_mgr="FreeBSD ports" --pkg_rm="pkg remove" -- - # https://eXtremeSHOK.com ###################################################### Modified: head/security/clamav-unofficial-sigs/files/pkg-message.in ============================================================================== --- head/security/clamav-unofficial-sigs/files/pkg-message.in Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/files/pkg-message.in Sun Jun 5 08:42:34 2016 (r416386) @@ -20,8 +20,6 @@ obsolete configuration file: %%PREFIX%%/etc/clamav-unofficial-sigs.conf To run the script periodically by cron, you also need to add it to -your crontab. Sample crontab and logrotate files are located in: - -%%EXAMPLESDIR%% +your crontab. ********************************************************************** Modified: head/security/clamav-unofficial-sigs/pkg-plist ============================================================================== --- head/security/clamav-unofficial-sigs/pkg-plist Sun Jun 5 03:35:27 2016 (r416385) +++ head/security/clamav-unofficial-sigs/pkg-plist Sun Jun 5 08:42:34 2016 (r416386) @@ -6,5 +6,3 @@ man/man8/clamav-unofficial-sigs.8.gz %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clamav-unofficial-sigs-cron -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clamav-unofficial-sigs-logrotate