Bug 175765
| Summary: | net-im/imspector ipfw support | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Oleg_Sch <7zsfx> | ||||
| Component: | Individual Port(s) | Assignee: | Po-Chien Lin <pclin> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) Maintainer of net-im/imspector,
Please note that PR ports/175765 has just been submitted.
If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.
The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175765
--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
- Add IPFW support and enable it by default - Use new Makefile header - Bump PORTREVISION due to binary change -- Mikhail Responsible Changed From-To: freebsd-ports-bugs->pclin I'll take it. Author: pclin Date: Mon Feb 25 04:25:37 2013 New Revision: 312904 URL: http://svnweb.freebsd.org/changeset/ports/312904 Log: - Add IPFW suuport [1] and enable it by default [2] - Trim Makefile header [2] - Remove invalid entry from MASTER_SITES - Patch to fix clang compiling - Tune pkg-plist to pet portlint(1) PR: ports/175765 Submitted by: Oleg_Sch <7zsfx@7zsfx.info> [1] Approved by: Mikhail Tsatsenko <m.tsatsenko@gmail.com> (maintainer) [2] Approved by: swills (mentor) Modified: head/net-im/imspector/Makefile head/net-im/imspector/pkg-plist Modified: head/net-im/imspector/Makefile ============================================================================== --- head/net-im/imspector/Makefile Mon Feb 25 04:12:49 2013 (r312903) +++ head/net-im/imspector/Makefile Mon Feb 25 04:25:37 2013 (r312904) @@ -1,15 +1,11 @@ -# New ports collection makefile for: imspector -# Date created: 17 March 2008 -# Whom: Ilja Dejs <ilja.dejs@gmail.com> -# +# Created by: Ilja Dejs <ilja.dejs@gmail.com> # $FreeBSD$ -# PORTNAME= imspector PORTVERSION= 20111108 +PORTREVISION= 1 CATEGORIES= net-im -MASTER_SITES= http://www.imspector.org/downloads/ \ - http://tsatsenko.ru/ports/distfiles/ +MASTER_SITES= http://tsatsenko.ru/ports/distfiles/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= IM transparent proxy with monitoring, blocking, and content-filtering @@ -28,12 +24,26 @@ USE_RC_SUBR= ${PORTNAME} MAKE_ENV+= ETCDIR=${ETCDIR} +OPTIONS_DEFINE= IPFW +OPTIONS_DEFAULT= IPFW +IPFW_DESC= Add IPFW support + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MIPFW} +CFLAGS+= -DIPFW_TRANSPARENT=1 +.endif + post-extract: - ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} + post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/imspector.conf \ ${WRKSRC}/main.cpp + @${REINPLACE_CMD} -e 's,= SSLv23_method(),= (SSL_METHOD *) SSLv23_method(),g' \ + ${WRKSRC}/sslstate.cpp + post-install: .for f in ${CONFIG_FILES} @if [ ! -f ${ETCDIR}/${f} ]; then \ Modified: head/net-im/imspector/pkg-plist ============================================================================== --- head/net-im/imspector/pkg-plist Mon Feb 25 04:12:49 2013 (r312903) +++ head/net-im/imspector/pkg-plist Mon Feb 25 04:25:37 2013 (r312904) @@ -27,5 +27,6 @@ lib/libimspector.so sbin/imspector @dirrmtry %%ETCDIR%% @dirrm lib/imspector -@unexec rmdir /var/lib/imspector 2>/dev/null || true -@unexec rmdir /var/log/imspector 2>/dev/null || true +@cwd /var +@dirrmtry %D/lib/imspector +@dirrmtry %D/log/imspector _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: feedback->closed Committed, with minor changes. Thanks! |
net-im/imspector: Ipfw transparent support already included in sources. Only 'Makefile' need small changes. Fix: MAKE_ENV+= ETCDIR=${ETCDIR} +OPTIONS= USE_IPFW "Use IPFW instead of PF" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_USE_IPFW) +CFLAGS += -DIPFW_TRANSPARENT=1 +.endif + post-extract: ${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} post-patch: @@ -41,4 +49,5 @@ fi .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk>--C2ADBAFVTpsvdSataLzCwh0pD7mcEF6vkUkq8J4W6mhxMSGa Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- Makefile.orig 2013-02-02 05:05:49.000000000 +1100 +++ Makefile 2013-02-02 05:10:08.000000000 +1100 @@ -28,6 +28,14 @@