diff options
| author | garga <garga@FreeBSD.org> | 2006-05-27 00:49:53 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2006-05-27 00:49:53 +0800 |
| commit | f26f249597fea8fadba63692229a9cdc80cec645 (patch) | |
| tree | b021371d270105e05b152fc67a5a62795e1f7173 /security/clamav | |
| parent | 2c5cd05773885b8452b6a98b19822a2bb4e462fb (diff) | |
| download | freebsd-ports-gnome-f26f249597fea8fadba63692229a9cdc80cec645.tar.gz freebsd-ports-gnome-f26f249597fea8fadba63692229a9cdc80cec645.tar.zst freebsd-ports-gnome-f26f249597fea8fadba63692229a9cdc80cec645.zip | |
- Add an option to print logs on stderr instead stdout, it's useful to catch
logs and use on smtp log. In preparation to update spamcontro to 2.4 series.
- s/unarj/arj/ on clamscan man [1]
- Bump PORTREVISION because man change
Reported by: Anton Yuzhaninov <citrin at citrin.ru> [1]
Diffstat (limited to 'security/clamav')
| -rw-r--r-- | security/clamav/Makefile | 11 | ||||
| -rw-r--r-- | security/clamav/files/extra-patch-shared_output.c | 17 |
2 files changed, 26 insertions, 2 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index fe2f544d39d1..18d4f2f4a466 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -7,7 +7,7 @@ PORTNAME= clamav PORTVERSION= 0.88.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= clamav @@ -24,7 +24,8 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \ OPTIONS= MILTER "Compile the milter interface" Off \ CURL "Support URL downloading" Off \ - LIBUNRAR "Support for external Unrar library" Off + LIBUNRAR "Support for external Unrar library" Off \ + STDERR "Print logs to stderr instead of stdout" Off USE_AUTOTOOLS= libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -130,9 +131,15 @@ RUN_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar EXTRA_PATCHES= ${FILESDIR}/extra-patch-libclamav__unrarlib.h .endif +.if defined(WITH_STDERR) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-shared_output.c +.endif + post-patch: @${REINPLACE_CMD} -e 's|-pthread -lc_r|${PTHREAD_LIBS}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's,unarj,arj,g' \ + ${WRKSRC}/docs/man/clamscan.1 pre-build: @if ${LDCONFIG} -r | ${GREP} -qw -e -lclamav; then \ diff --git a/security/clamav/files/extra-patch-shared_output.c b/security/clamav/files/extra-patch-shared_output.c new file mode 100644 index 000000000000..ddb4ab029f38 --- /dev/null +++ b/security/clamav/files/extra-patch-shared_output.c @@ -0,0 +1,17 @@ +--- shared/output.c.orig Thu May 18 22:10:40 2006 ++++ shared/output.c Thu May 18 22:12:43 2006 +@@ -236,7 +236,13 @@ + return; + } + +- fd = stdout; ++/* fd = stdout; (missing flag 'mprintf_stdout') --eh. */ ++ ++ if(mprintf_stdout) ++ fd = stdout; ++ else ++ fd = stderr; ++ + + /* legend: + * ! - error |