On 2010/05/19 17:41, Stuart Henderson wrote:
> Minor update to 0.95.1. Please test/comment. I'm interested to
> see "make regress" and any packing-list changes with "make plist"
> for sparc64, macppc, hppa if possible. Please send
> ${WRKDIR}/regress.log offlist if you try this. Thanks.
thanks, I have sparc64 and macppc tests now.
> clamav has an internal stripped-down copy of llvm, it may take
> some time...
>
> (as an aside, if someone wants to add support to python.port.mk
> for using python as a dependency for regression tests only, and not
> mess with CATEGORIES or BUILD_DEPENDS, that would be nice ;)
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/clamav/Makefile,v
> retrieving revision 1.48
> diff -u -p -r1.48 Makefile
> --- Makefile 1 Apr 2010 13:18:54 -0000 1.48
> +++ Makefile 19 May 2010 16:26:25 -0000
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.48 2010/04/01 13:18:54 sthen Exp $
>
> COMMENT= virus scanner
> -DISTNAME= clamav-0.96
> +DISTNAME= clamav-0.96.1
> CATEGORIES= security
> SHARED_LIBS= clamav 13.0 \
> clamunrar 2.0 \
> @@ -50,6 +50,8 @@ CONFIGURE_ARGS+= --disable-clamav
> --with-ltdl-lib=${LOCALBASE}/lib
>
> REGRESS_TARGET= check
> +MODULES= lang/python
> +MODPY_RUNDEP= no
>
> CONFIGURE_ENV+= LDFLAGS="-pthread -L/usr/lib
> -L${WRKSRC}/libclamav/.libs -L${LOCALBASE}/lib" \
> CPPFLAGS="-I/usr/include -I${LOCALBASE}/include"
> @@ -64,5 +66,8 @@ post-install:
> clamav-milter.conf ${PREFIX}/share/examples/clamav
> cd ${WRKSRC}/examples; ${INSTALL_DATA} ex1.c \
> ${PREFIX}/share/examples/clamav
> +
> +pre-regress:
> + ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/security/clamav/distinfo,v
> retrieving revision 1.33
> diff -u -p -r1.33 distinfo
> --- distinfo 1 Apr 2010 13:18:54 -0000 1.33
> +++ distinfo 19 May 2010 16:26:25 -0000
> @@ -1,5 +1,5 @@
> -MD5 (clamav-0.96.tar.gz) = KKx77EzANieo4tboZH7mYQ==
> -RMD160 (clamav-0.96.tar.gz) = 2RR9HaT8f6Po1CslxYqT9ruqWIs=
> -SHA1 (clamav-0.96.tar.gz) = vnyzfyphIcrMPNOWnu4hK5bva1c=
> -SHA256 (clamav-0.96.tar.gz) = ewtuZ8h9Q7BM477Ors3frzREmfDuRelWjfa+FoCIedI=
> -SIZE (clamav-0.96.tar.gz) = 39792593
> +MD5 (clamav-0.96.1.tar.gz) = OOeHDbbprQ5WlRhJmm82UQ==
> +RMD160 (clamav-0.96.1.tar.gz) = 8HCLkhyLAaQwn+dB7BQauMvfI1E=
> +SHA1 (clamav-0.96.1.tar.gz) = zbJEkPQCdIy/tXzIdZL+d7Rw4KU=
> +SHA256 (clamav-0.96.1.tar.gz) = QT3SWQcFkGjaKjZ9KzMPvDfV0nZOs7BHIUznVKnKdOo=
> +SIZE (clamav-0.96.1.tar.gz) = 40568982
> Index: patches/patch-unit_tests_check_common_sh
> ===================================================================
> RCS file: patches/patch-unit_tests_check_common_sh
> diff -N patches/patch-unit_tests_check_common_sh
> --- patches/patch-unit_tests_check_common_sh 30 Oct 2009 01:09:34 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-unit_tests_check_common_sh,v 1.1 2009/10/30 01:09:34 sthen
> Exp $
> ---- unit_tests/check_common.sh.orig Thu Oct 29 16:34:54 2009
> -+++ unit_tests/check_common.sh Thu Oct 29 16:35:05 2009
> -@@ -47,7 +47,7 @@ die()
> -
> - # Setup test directory to avoid temporary and output file clashes
> - test_start() {
> -- ulimit -t 120; ulimit -d 512000; ulimit -v 512000;
> -+ ulimit -t 120; ulimit -d 512000;
> - (cd test-$1 2>/dev/null && killclamd || true)
> - rm -rf test-$1
> - mkdir test-$1
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/clamav/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST
> --- pkg/PLIST 1 Apr 2010 13:18:54 -0000 1.13
> +++ pkg/PLIST 19 May 2010 16:26:25 -0000
> @@ -24,6 +24,7 @@ lib/pkgconfig/libclamav.pc
> @man man/man1/clamscan.1
> @man man/man1/freshclam.1
> @man man/man1/sigtool.1
> +...@man man/man5/clamav-milter.conf.5
> @man man/man5/clamd.conf.5
> @man man/man5/freshclam.conf.5
> @man man/man8/clamav-milter.8
>
