sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add an option to print logs on stderr instead stdout, it's useful to catch

Browse source 
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]
This commit is contained in:
Renato Botelho 2006-05-26 16:49:53 +00:00
parent 67a6607751
commit 01a61f0371
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=163504
4 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
security/clamav-devel/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= clamav
PORTVERSION= 20060525
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.clamav.net/snapshot/ \
http://www.galle.com.br/~garga/clamav-devel/
@ -25,7 +26,8 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \
unzip:${PORTSDIR}/archivers/unzip
OPTIONS= MILTER "Compile the milter interface" Off \
CURL "Support URL downloading" Off
CURL "Support URL downloading" Off \
STDERR "Print logs to stderr instead of stdout" Off
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@ -125,11 +127,17 @@ CONFIGURE_ARGS+= --with-libcurl
CONFIGURE_ARGS+= --without-libcurl
.endif
.if defined(WITH_STDERR)
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-shared_output.c
.endif
post-patch:
@${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,$$(prefix)/libdata/pkgconfig,' \
${WRKSRC}/Makefile.in
@${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 \

17
security/clamav-devel/files/extra-patch-shared_output.c Normal file
View file

@ -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

11
security/clamav/Makefile
View file

@ -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 \

17
security/clamav/files/extra-patch-shared_output.c Normal file
View file

@ -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