Date: Fri, 9 Mar 2007 06:12:50 GMT From: Elisey Savateev<b3k@mail.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/110117: [PATCH] www/havp: update to 0.85 Message-ID: <200703090612.l296CoEI008465@www.freebsd.org> Resent-Message-ID: <200703090620.l296K5vU075614@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110117 >Category: ports >Synopsis: [PATCH] www/havp: update to 0.85 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Mar 09 06:20:05 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Elisey Savateev >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: FreeBSD beastie 6.2-STABLE FreeBSD 6.2-STABLE #14: Thu Jan 18 13:39:30 YEKT 2007 >Description: - Update to 0.85 - Some OPTIONS added - Some improvements and cleanups Added file(s): - files/patch-havp-Makefile.in Removed file(s): - files/patch-havp_Makefile.in - files/patch-havp_scanners_clamlibscanner.cpp >How-To-Repeat: >Fix: --- havp-0.85.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/havp/Makefile /home/bio3k/my_proj/ports/havp/havp/Makefile --- /usr/ports/www/havp/Makefile Tue Feb 20 08:37:07 2007 +++ /home/bio3k/my_proj/ports/havp/havp/Makefile Fri Mar 9 09:59:13 2007 @@ -6,8 +6,7 @@ # PORTNAME= havp -PORTVERSION= 0.82 -PORTREVISION= 1 +PORTVERSION= 0.85 CATEGORIES= www MASTER_SITES= http://www.server-side.de/download/ \ http://bio3k.softboard.ru/uploads/arch/ @@ -21,6 +20,7 @@ USE_GMAKE= yes USE_RC_SUBR= havp CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ARGS= --disable-locking LOG_DIR= /var/log/havp TMP_DIR= /var/tmp/havp @@ -30,22 +30,44 @@ SUB_FILES= pkg-install pkg-deinstall SUB_LIST= LOG_DIR=${LOG_DIR} TMP_DIR=${TMP_DIR} RUN_DIR=${RUN_DIR} +OPTIONS= SSL "Enable SSL proxying (not scanned, only forwarded!)" on \ + CLAMAV "Enable libclamav support" on \ + TROPHIE "Enable Trend Micro (Trophie) support" off + .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 BROKEN= this port does not compile on FreeBSD 4.x. .endif +.if defined(WITH_SSL) +CONFIGURE_ARGS+= --enable-ssl-tunnel +.else +CONFIGURE_ARGS+= --disable-ssl-tunnel +.endif + +.if defined(WITH_CLAMAV) +CONFIGURE_ARGS+= --enable-clamav +.else +CONFIGURE_ARGS+= --disable-clamav +.endif + +.if defined(WITH_TROPHIE) +CONFIGURE_ARGS+= --enable-trophie +.else +CONFIGURE_ARGS+= --disable-trophie +.endif + pre-install: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @[ -f ${PREFIX}/etc/havp/havp.config ] || \ - ${CP} -p ${PREFIX}/etc/havp/havp.config.default ${PREFIX}/etc/havp/havp.config + ${CP} ${PREFIX}/etc/havp/havp.config.default ${PREFIX}/etc/havp/havp.config @${MKDIR} ${EXAMPLESDIR} @${CP} ${WRKSRC}/etc/havp/blacklist ${EXAMPLESDIR}/blacklist.sample @${CP} -R ${WRKSRC}/etc/havp/templates ${EXAMPLESDIR} @${CP} ${WRKSRC}/etc/havp/whitelist ${EXAMPLESDIR}/whitelist.sample - @${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/www/havp/distinfo /home/bio3k/my_proj/ports/havp/havp/distinfo --- /usr/ports/www/havp/distinfo Thu Aug 3 20:46:24 2006 +++ /home/bio3k/my_proj/ports/havp/havp/distinfo Fri Mar 9 09:12:25 2007 @@ -1,3 +1,3 @@ -MD5 (havp-0.82.tar.gz) = 9e6a16b7d074782d1c62f1f7316e56ab -SHA256 (havp-0.82.tar.gz) = e2db8d3383cd8eca6a18ebee85875de895f3ac7414eab091a87f052d79a87b09 -SIZE (havp-0.82.tar.gz) = 105217 +MD5 (havp-0.85.tar.gz) = 6f05d36a1f8374535ae66373111ff5a1 +SHA256 (havp-0.85.tar.gz) = 523c7d69728c600e3cf33603a2caf41755a8e70fa4a20b71cba61df5f16bb2b4 +SIZE (havp-0.85.tar.gz) = 101860 diff -ruN --exclude=CVS /usr/ports/www/havp/files/patch-havp-Makefile.in /home/bio3k/my_proj/ports/havp/havp/files/patch-havp-Makefile.in --- /usr/ports/www/havp/files/patch-havp-Makefile.in Thu Jan 1 05:00:00 1970 +++ /home/bio3k/my_proj/ports/havp/havp/files/patch-havp-Makefile.in Fri Mar 9 10:21:33 2007 @@ -0,0 +1,26 @@ +--- havp/Makefile.in.orig Fri Mar 9 10:18:56 2007 ++++ havp/Makefile.in Fri Mar 9 10:20:54 2007 +@@ -25,23 +25,6 @@ + $(INSTALL) -m 755 -d $(etcdir) + $(INSTALL) -s -m 755 havp $(prefix)/sbin/havp + $(INSTALL) -m 644 ../etc/havp/havp.config $(etcdir)/havp.config.default +- if [ ! -f $(etcdir)/havp.config ]; then \ +- $(INSTALL) -m 644 ../etc/havp/havp.config $(etcdir)/havp.config; \ +- else \ +- ../update-conf $(etcdir)/havp.config; \ +- fi +- if [ ! -f $(etcdir)/whitelist ]; then \ +- $(INSTALL) -m 644 ../etc/havp/whitelist $(etcdir)/whitelist; \ +- fi +- if [ ! -f $(etcdir)/blacklist ]; then \ +- $(INSTALL) -m 644 ../etc/havp/blacklist $(etcdir)/blacklist; \ +- fi +- cp -r ../etc/havp/templates $(etcdir) +- chmod -R a+rX $(etcdir)/templates +- +- @echo "" +- @echo "HAVP installed - see documentation for needed extra steps" +- @echo "" + + clean: + cd scanners && $(MAKE) clean diff -ruN --exclude=CVS /usr/ports/www/havp/files/patch-havp_Makefile.in /home/bio3k/my_proj/ports/havp/havp/files/patch-havp_Makefile.in --- /usr/ports/www/havp/files/patch-havp_Makefile.in Sun Jun 18 10:54:26 2006 +++ /home/bio3k/my_proj/ports/havp/havp/files/patch-havp_Makefile.in Thu Jan 1 05:00:00 1970 @@ -1,34 +0,0 @@ ---- havp/Makefile.in.bak Sun Apr 23 18:31:11 2006 -+++ havp/Makefile.in Sat Jun 17 12:12:17 2006 -@@ -26,31 +26,7 @@ - install: all - $(INSTALL) -d $(sbindir) - $(INSTALL) -s -m 755 havp $(sbindir)/havp -- $(INSTALL) -d -m 755 /var/log/havp/ -- $(INSTALL) -d -m 755 /var/tmp/havp/ -- $(INSTALL) -d -m 755 /var/run/havp/ -- $(INSTALL) -d /etc/init.d -- $(INSTALL) -m 755 ../etc/init.d/havp /etc/init.d/ - $(INSTALL) -m 644 ../etc/havp/havp.config $(etcdir)/havp/havp.config.default -- @if [ ! -f $(etcdir)/havp/havp.config ]; then \ -- $(INSTALL) -m 644 ../etc/havp/havp.config $(etcdir)/havp/havp.config; \ -- else \ -- ../update-conf $(etcdir)/havp/havp.config; \ -- fi -- @if [ ! -f $(etcdir)/havp/whitelist ]; then \ -- $(INSTALL) -m 644 ../etc/havp/whitelist $(etcdir)/havp/whitelist; \ -- fi -- @if [ ! -f $(etcdir)/havp/blacklist ]; then \ -- $(INSTALL) -m 644 ../etc/havp/blacklist $(etcdir)/havp/blacklist; \ -- fi -- cp -r ../etc/havp/templates $(etcdir)/havp -- chmod -R a+rX $(etcdir)/havp/templates -- @echo "" -- @echo "Remember to give correct permissions:" -- @echo " chown <havpuser> /var/tmp/havp (after mounting if needed)" -- @echo " chown <havpuser> /var/log/havp" -- @echo " chown <havpuser> /var/run/havp" -- @echo "" - - clean: - rm -f havp *.o scanners/*.o diff -ruN --exclude=CVS /usr/ports/www/havp/files/patch-havp_scanners_clamlibscanner.cpp /home/bio3k/my_proj/ports/havp/havp/files/patch-havp_scanners_clamlibscanner.cpp --- /usr/ports/www/havp/files/patch-havp_scanners_clamlibscanner.cpp Sun Feb 18 23:34:13 2007 +++ /home/bio3k/my_proj/ports/havp/havp/files/patch-havp_scanners_clamlibscanner.cpp Thu Jan 1 05:00:00 1970 @@ -1,20 +0,0 @@ ---- havp/scanners/clamlibscanner.cpp.orig Sun Feb 18 15:32:07 2007 -+++ havp/scanners/clamlibscanner.cpp Sun Feb 18 15:32:35 2007 -@@ -29,7 +29,7 @@ - - LogFile::ErrorMessage("ClamAV: Using database directory: %s\n", dbdir); - -- if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 ) -+ if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 ) - { - LogFile::ErrorMessage("ClamAV: Could not load database: %s\n", cl_strerror(ret)); - return false; -@@ -65,7 +65,7 @@ - - cl_settempdir(Params::GetConfigString("TEMPDIR").c_str(), 0); - -- if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 ) -+ if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 ) - { - LogFile::ErrorMessage("ClamAV: Could not reload database: %s\n", cl_strerror(ret)); - return false; diff -ruN --exclude=CVS /usr/ports/www/havp/files/pkg-deinstall.in /home/bio3k/my_proj/ports/havp/havp/files/pkg-deinstall.in --- /usr/ports/www/havp/files/pkg-deinstall.in Sun Jun 18 10:54:26 2006 +++ /home/bio3k/my_proj/ports/havp/havp/files/pkg-deinstall.in Fri Mar 9 10:54:01 2007 @@ -7,10 +7,20 @@ HAVP_USER=havp -if pw usershow "$HAVP_USER" 2>/dev/null 1>&2; then - echo "==============================================================================" - echo "To delete $HAVP_USER user permanently, use 'pw userdel \"$HAVP_USER\"'" - echo "==============================================================================" +echo +echo "====================================================" +echo +echo "If you want remove havp permanently from you system" +echo "execute following commands:" +echo +echo " # rm -rf %%LOG_DIR%%" +echo " # rm -rf %%RUN_DIR%%" +echo " # rm -rf %%TMP_DIR%%" +if pw usershow "${HAVP_USER}" 2>/dev/null 1>&2; then + echo " # pw userdel ${HAVP_USER}" fi +echo +echo "====================================================" +echo exit 0 diff -ruN --exclude=CVS /usr/ports/www/havp/files/pkg-install.in /home/bio3k/my_proj/ports/havp/havp/files/pkg-install.in --- /usr/ports/www/havp/files/pkg-install.in Sun Jun 18 10:54:26 2006 +++ /home/bio3k/my_proj/ports/havp/havp/files/pkg-install.in Fri Mar 9 09:57:56 2007 @@ -1,14 +1,14 @@ #!/bin/sh # $FreeBSD: ports/www/havp/files/pkg-install.in,v 1.1 2006/06/18 04:54:26 novel Exp $ -DEST_DIR=${PKG_DESTDIR:-} +PREFIX=${PKG_PREFIX:-%%PREFIX%%} HAVP_USER=havp HAVP_GROUP=havp -LOG_DIR=$DEST_DIR%%LOG_DIR%% -TMP_DIR=$DEST_DIR%%TMP_DIR%% -RUN_DIR=$DEST_DIR%%RUN_DIR%% +LOG_DIR=%%LOG_DIR%% +TMP_DIR=%%TMP_DIR%% +RUN_DIR=%%RUN_DIR%% if [ "$2" = "PRE-INSTALL" ]; then if ! pw groupshow "$HAVP_GROUP" 2>/dev/null 1>&2; then diff -ruN --exclude=CVS /usr/ports/www/havp/pkg-plist /home/bio3k/my_proj/ports/havp/havp/pkg-plist --- /usr/ports/www/havp/pkg-plist Sun Jun 18 10:54:26 2006 +++ /home/bio3k/my_proj/ports/havp/havp/pkg-plist Fri Mar 9 10:47:37 2007 @@ -121,6 +121,6 @@ @dirrm %%EXAMPLESDIR%%/templates %%EXAMPLESDIR%%/whitelist.sample @dirrm %%EXAMPLESDIR%% -@unexec rmdir %%LOG_DIR%% 2>/dev/null || true -@unexec rmdir %%TMP_DIR%% 2>/dev/null || true -@unexec rmdir %%RUN_DIR%% 2>/dev/null || true +@dirrmtry %%LOG_DIR%% +@dirrmtry %%TMP_DIR%% +@dirrmtry %%RUN_DIR%% --- havp-0.85.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703090612.l296CoEI008465>