Attachment 158319 Details for Bug 201323 – Convert all sshguard ports into one port & make use the OPTIONS framework

[patch] Convert all sshguard ports into one port & make use the OPTIONS framework

sshguard.patch (text/plain), 4.33 KB, created by Alastair Hogge on 2015-07-04 05:52:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alastair Hogge

Created: 2015-07-04 05:52:24 UTC

Size: 4.33 KB

patch

obsolete

>Index: security/sshguard/Makefile
>===================================================================
>--- security/sshguard/Makefile	(revision 391291)
>+++ security/sshguard/Makefile	(working copy)
>@@ -8,12 +8,10 @@
> MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}
> 
> MAINTAINER=	feld@FreeBSD.org
>-COMMENT?=	Protect hosts from brute force attacks against ssh and other services
>+COMMENT=	Protect hosts from brute force attacks against ssh and other services
> 
> LICENSE=	BSD2CLAUSE
> 
>-CONFLICTS?=	sshguard-ipfilter-1.* sshguard-ipfw-1.* sshguard-pf-1.*
>-
> USES=		autoreconf tar:xz
> 
> PLIST_FILES=	sbin/sshguard man/man8/sshguard.8.gz
>@@ -21,22 +19,43 @@
> USE_RC_SUBR=	sshguard
> MAKE_ARGS+=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}"
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=--with-firewall=${SSHGUARDFW}
> 
>-SUB_LIST+=	PKGMSG_FWBLOCK=${PKGMSG_FWBLOCK}
>-SUB_FILES=	pkg-message
>+OPTIONS_SINGLE=	BACKEND
>+OPTIONS_SINGLE_BACKEND=	HOSTS IPFILTER IPFW NULL PF
> 
>-# backend type in { hosts, ipfw, pf }
>-SSHGUARDFW?=	hosts
>+BACKEND_DESC=	Firewall backend support
>+HOSTS_DESC=	Build with /etc/hosts.allow support
>+IPFILTER_DESC=	Build with ipfilter(4) support
>+IPFW_DESC=	Build with ipfw(8) support
>+NULL_DESC=	Null backend, can be used for executing a custom process
>+PF_DESC=	Build with pf(4) support
> 
>-.if ${SSHGUARDFW} == pf
>-PKGMSG_FWBLOCK="  To activate or configure PF see http://sshguard.sf.net/doc/setup/blockingpf.html"
>-.elif ${SSHGUARDFW} == ipfw
>-PKGMSG_FWBLOCK="  Verify that IPFW is active with \"ipfw show\"."
>-.elif ${SSHGUARDFW} == hosts
>-PKGMSG_FWBLOCK="  Sshguard is going to use /etc/hosts.allow. Please remember to touch /etc/hosts.allow\!"
>-.elif ${SSHGUARDFW} == ipfilter
>-PKGMSG_FWBLOCK="  Sshguard will use /etc/ipf.rules as ruleset."
>+OPTIONS_DEFAULT=	NULL
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MHOSTS}
>+CONFIGURE_ARGS+=--with-firewall=hosts
>+PKGMSG_FWBLOCK="  sshguard(8) will directly write to /etc/hosts.allow.  See hosts_options(5)."
> .endif
>+.if ${PORT_OPTIONS:MIPFILTER}
>+CONFIGURE_ARGS+=--with-firewall=ipfilter
>+PKGMSG_FWBLOCK="  sshguard(8) will use /etc/ipf.rules as the ruleset."
>+.endif
>+.if ${PORT_OPTIONS:MIPFW}
>+CONFIGURE_ARGS+=--with-firewall=ipfw
>+PKGMSG_FWBLOCK="  sshguard(8) will use rules numbered from 55000 to 55050 to block offenders."
>+.endif
>+.if ${PORT_OPTIONS:MNULL}
>+CONFIGURE_ARGS+=--with-firewall=null
>+PKGMSG_FWBLOCK="  sshguard(8) will not call any firewall backend.  Users can define sshguard_flags in /etc/rc.conf for executing a custom script."
>+.endif
>+.if ${PORT_OPTIONS:MPF}
>+CONFIGURE_ARGS+=--with-firewall=pf
>+PKGMSG_FWBLOCK="  sshguard(8) will use table <sshguard> to block offenders."
>+.endif
> 
>+SUB_LIST+=	PKGMSG_FWBLOCK=${PKGMSG_FWBLOCK}
>+SUB_FILES=	pkg-message
>+
> .include <bsd.port.mk>
>Index: security/sshguard-ipfilter/Makefile
>===================================================================
>--- security/sshguard-ipfilter/Makefile	(revision 391291)
>+++ security/sshguard-ipfilter/Makefile	(working copy)
>@@ -1,12 +0,0 @@
>-# Created by: Mij <mij@bitchx.it>
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-ipfilter
>-CONFLICTS=	sshguard-1.* sshguard-ipfw-1.* sshguard-pf-1.*
>-
>-COMMENT=	Protect hosts from brute force attacks against ssh and other services using ipfilter
>-
>-SSHGUARDFW=	ipfilter
>-MASTERDIR=	${.CURDIR}/../sshguard
>-
>-.include "${MASTERDIR}/Makefile"
>Index: security/sshguard-ipfw/Makefile
>===================================================================
>--- security/sshguard-ipfw/Makefile	(revision 391291)
>+++ security/sshguard-ipfw/Makefile	(working copy)
>@@ -1,13 +0,0 @@
>-# Created by: Mij <mij@bitchx.it>
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-ipfw
>-
>-COMMENT=	Protect hosts from brute force attacks against ssh and other services using ipfw
>-
>-CONFLICTS=	sshguard-1.* sshguard-ipfilter-1.* sshguard-pf-1.*
>-
>-SSHGUARDFW=	ipfw
>-MASTERDIR=	${.CURDIR}/../sshguard
>-
>-.include "${MASTERDIR}/Makefile"
>Index: security/sshguard-pf/Makefile
>===================================================================
>--- security/sshguard-pf/Makefile	(revision 391291)
>+++ security/sshguard-pf/Makefile	(working copy)
>@@ -1,13 +0,0 @@
>-# Created by: Mij <mij@bitchx.it>
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-pf
>-
>-COMMENT=	Protect hosts from brute force attacks against ssh and other services using pf
>-
>-CONFLICTS=	sshguard-1.* sshguard-ipfilter-1.* sshguard-ipfw-1.*
>-
>-SSHGUARDFW=	pf
>-MASTERDIR=	${.CURDIR}/../sshguard
>-
>-.include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 201323: 158319 | 158321 | 158911