diff options
author | Roman Bogorodskiy <novel@FreeBSD.org> | 2007-03-15 07:01:04 +0000 |
---|---|---|
committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2007-03-15 07:01:04 +0000 |
commit | 60f68136a38f96d57067214e52b021debf5199e5 (patch) | |
tree | 047240556251406b749738f54b4d9b8687b47bda /www/havp | |
parent | Use relative dir for master port instead of using ${MASTERDIR}. (diff) |
Update to 0.85.
PR: 110117
Submitted by: Elisey Savateev (maintainer)
Notes
Notes:
svn path=/head/; revision=187427
Diffstat (limited to 'www/havp')
-rw-r--r-- | www/havp/Makefile | 35 | ||||
-rw-r--r-- | www/havp/distinfo | 6 | ||||
-rw-r--r-- | www/havp/files/patch-havp_Makefile.in | 44 | ||||
-rw-r--r-- | www/havp/files/patch-havp_scanners_clamlibscanner.cpp | 20 | ||||
-rw-r--r-- | www/havp/files/pkg-deinstall.in | 18 | ||||
-rw-r--r-- | www/havp/files/pkg-install.in | 8 | ||||
-rw-r--r-- | www/havp/pkg-plist | 6 |
7 files changed, 71 insertions, 66 deletions
diff --git a/www/havp/Makefile b/www/havp/Makefile index 49700b188df7..c3c86bead84a 100644 --- a/www/havp/Makefile +++ b/www/havp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= havp -PORTVERSION= 0.82 -PORTREVISION= 2 +PORTVERSION= 0.85 CATEGORIES= www MASTER_SITES= http://www.server-side.de/download/ \ http://bio3k.softboard.ru/uploads/arch/ @@ -15,12 +14,14 @@ MASTER_SITES= http://www.server-side.de/download/ \ MAINTAINER= b3k@mail.ru COMMENT= HTTP Antivirus Proxy -LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav +LIB_DEPENDS= clamav.1:${PORTSDIR}/security/clamav GNU_CONFIGURE= yes USE_GMAKE= yes +USE_PERL5_BUILD= 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 +31,44 @@ PLIST_SUB+= LOG_DIR=${LOG_DIR} TMP_DIR=${TMP_DIR} RUN_DIR=${RUN_DIR} 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 --git a/www/havp/distinfo b/www/havp/distinfo index 71cd8ed70fa4..dcd72e7a9e80 100644 --- a/www/havp/distinfo +++ b/www/havp/distinfo @@ -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 --git a/www/havp/files/patch-havp_Makefile.in b/www/havp/files/patch-havp_Makefile.in index 2a96281e8854..ca3d67929d2b 100644 --- a/www/havp/files/patch-havp_Makefile.in +++ b/www/havp/files/patch-havp_Makefile.in @@ -1,34 +1,26 @@ ---- 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; \ +--- 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/havp.config; \ +- ../update-conf $(etcdir)/havp.config; \ - fi -- @if [ ! -f $(etcdir)/havp/whitelist ]; then \ -- $(INSTALL) -m 644 ../etc/havp/whitelist $(etcdir)/havp/whitelist; \ +- if [ ! -f $(etcdir)/whitelist ]; then \ +- $(INSTALL) -m 644 ../etc/havp/whitelist $(etcdir)/whitelist; \ - fi -- @if [ ! -f $(etcdir)/havp/blacklist ]; then \ -- $(INSTALL) -m 644 ../etc/havp/blacklist $(etcdir)/havp/blacklist; \ +- if [ ! -f $(etcdir)/blacklist ]; then \ +- $(INSTALL) -m 644 ../etc/havp/blacklist $(etcdir)/blacklist; \ - fi -- cp -r ../etc/havp/templates $(etcdir)/havp -- chmod -R a+rX $(etcdir)/havp/templates +- cp -r ../etc/havp/templates $(etcdir) +- chmod -R a+rX $(etcdir)/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 "HAVP installed - see documentation for needed extra steps" - @echo "" clean: - rm -f havp *.o scanners/*.o + cd scanners && $(MAKE) clean diff --git a/www/havp/files/patch-havp_scanners_clamlibscanner.cpp b/www/havp/files/patch-havp_scanners_clamlibscanner.cpp deleted file mode 100644 index 7e49825f8fbd..000000000000 --- a/www/havp/files/patch-havp_scanners_clamlibscanner.cpp +++ /dev/null @@ -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 --git a/www/havp/files/pkg-deinstall.in b/www/havp/files/pkg-deinstall.in index 4338bcc9642f..9374d85b4d22 100644 --- a/www/havp/files/pkg-deinstall.in +++ b/www/havp/files/pkg-deinstall.in @@ -7,10 +7,20 @@ fi 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 --git a/www/havp/files/pkg-install.in b/www/havp/files/pkg-install.in index f84758aa9366..cbb615679761 100644 --- a/www/havp/files/pkg-install.in +++ b/www/havp/files/pkg-install.in @@ -1,14 +1,14 @@ #!/bin/sh # $FreeBSD$ -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 --git a/www/havp/pkg-plist b/www/havp/pkg-plist index 213dc520e7c2..a7ed8689cf66 100644 --- a/www/havp/pkg-plist +++ b/www/havp/pkg-plist @@ -121,6 +121,6 @@ etc/havp/havp.config.default @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%% |