diff options
| -rw-r--r-- | security/clamav-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/clamav-devel/distinfo | 4 | ||||
| -rw-r--r-- | security/clamav-devel/files/patch-unit_tests-check_common_sh | 24 |
3 files changed, 3 insertions, 27 deletions
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index e08c9e210704..439a9252e20c 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 20110704 +PORTVERSION= 20111104 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ \ LOCAL/garga/clamav-devel diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo index b256c6e21ac0..cecce33f35ce 100644 --- a/security/clamav-devel/distinfo +++ b/security/clamav-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (clamav-devel-20110704.tar.gz) = 3a895f434ec6fc87f6a66a2601ba2cecbf45ab685d118743bbf438fce9d8a63f -SIZE (clamav-devel-20110704.tar.gz) = 36869288 +SHA256 (clamav-devel-20111104.tar.gz) = bc74b7e2f42a084551a415d2d32affa5ef70dacfcf94456e5142be5bcee1ba4b +SIZE (clamav-devel-20111104.tar.gz) = 36871906 diff --git a/security/clamav-devel/files/patch-unit_tests-check_common_sh b/security/clamav-devel/files/patch-unit_tests-check_common_sh deleted file mode 100644 index 6bc88a25792c..000000000000 --- a/security/clamav-devel/files/patch-unit_tests-check_common_sh +++ /dev/null @@ -1,24 +0,0 @@ -$RANDOM is a bashism, it has been replaced with portable code. - -Also, the randomly generated port is checked to make sure it's not already -in use. - ---- unit_tests/check_common.sh.orig 2011-05-13 12:25:31.000000000 +0100 -+++ unit_tests/check_common.sh 2011-06-28 19:12:00.683905036 +0100 -@@ -58,9 +58,13 @@ - aa15bcf478d165efd2065190eb473bcb:544:ClamAV-Test-File - EOF - port=331$1 -- if test "x$RANDOM" != "x"; then -- port=1`expr 100 + \( $RANDOM % 899 \)`$1 -- fi -+ tries=0 -+ while nc -z localhost $port 2>/dev/null -+ do rand=` ( echo $$ ; time ps 2>&1 ; date ) | cksum | cut -f1 -d" " ` -+ port=1`expr 100 + \( $rand % 899 \)`$1 -+ [ $tries -gt 100 ] && echo Giving up, too many ports open && exit 1 -+ tries=`expr $tries + 1` -+ done - cat <<EOF >test-clamd.conf - LogFile `pwd`/clamd-test.log - LogFileMaxSize 0 |