Attachment 187581 Details for Bug 223322 – patch against head

[patch] patch against head

suricata-4.0.1.diff (text/plain), 3.14 KB, created by Franco Fichtner on 2017-10-30 11:34:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2017-10-30 11:34:08 UTC

Size: 3.14 KB

patch

obsolete

>diff --git a/security/suricata/Makefile b/security/suricata/Makefile
>index bf7a3cbc00d2..2d5b8eb9d34e 100644
>--- a/security/suricata/Makefile
>+++ b/security/suricata/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	suricata
>-PORTVERSION=	4.0.0
>+PORTVERSION=	4.0.1
> CATEGORIES=	security
> MASTER_SITES=	http://www.openinfosecfoundation.org/download/
> 
>diff --git a/security/suricata/distinfo b/security/suricata/distinfo
>index ace9ae81ebf1..8ea27a8f8bd8 100644
>--- a/security/suricata/distinfo
>+++ b/security/suricata/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1501558442
>-SHA256 (suricata-4.0.0.tar.gz) = 6b8b183a8409829ca92c71854cc1abed45f04ccfb7f14c08211f4edf571fa577
>-SIZE (suricata-4.0.0.tar.gz) = 12252693
>+TIMESTAMP = 1508393375
>+SHA256 (suricata-4.0.1.tar.gz) = 0e73edb2911791644d82a62ab4f75517bbed339c0f21aadc0eb307b313643885
>+SIZE (suricata-4.0.1.tar.gz) = 12311016
>diff --git a/security/suricata/files/suricata.in b/security/suricata/files/suricata.in
>index d93a2f9fbfa3..7e1ef82d8ef8 100644
>--- a/security/suricata/files/suricata.in
>+++ b/security/suricata/files/suricata.in
>@@ -19,13 +19,17 @@
> #				Default: 8000
> # suricata_netmap (str):	Set to YES to enable netmap (Inline Mode)
> #				Default: NO
>-
>+# suricata_user (str):		Set the user to run suricata as
>+#				Default: root
>+# suricata_pidfile (str):	Pidfile to store pid of suricata process
>+#				Default: /var/run/suricata.pid
> 
> . /etc/rc.subr
> 
> name="suricata"
> rcvar=suricata_enable
> 
>+start_precmd="suricata_prestart"
> command="%%PREFIX%%/bin/suricata"
> 
> load_rc_config $name
>@@ -35,6 +39,8 @@ load_rc_config $name
> [ -z "$suricata_flags" ]	&& suricata_flags="-D"
> [ -z "$suricata_divertport" ]	&& suricata_divertport="8000"
> [ -z "$suricata_netmap" ]	&& suricata_netmap="NO"
>+[ -z "$suricata_user" ]		&& suricata_user="root"
>+[ -z "$suricata_pidfile" ]	&& suricata_pidfile="/var/run/suricata.pid"
> 
> if [ -n "$suricata_interface" ]; then
> 	for interface in $suricata_interface; do
>@@ -47,9 +53,16 @@ else
> 	info "Inline Mode on divert port $suricata_divertport (suricata_interface not defined)"
> fi
> 
>-pidfile="/var/run/suricata.pid"
>+pidfile=$suricata_pidfile
> suricata_flags="$suricata_flags --pidfile $pidfile"
> 
> [ -n "$suricata_conf" ]	&& suricata_flags="$suricata_flags -c $suricata_conf"
> 
>+suricata_prestart()
>+{
>+	if ! run_rc_command status > /dev/null; then
>+		rm -f "$pidfile"
>+	fi
>+}
>+
> run_rc_command "$1"
>diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
>index 52f819a6cc43..5595c7f37e28 100644
>--- a/www/phalcon/Makefile
>+++ b/www/phalcon/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	phalcon
>-PORTVERSION=	3.2.2
>+PORTVERSION=	3.2.4
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> 
>diff --git a/www/phalcon/distinfo b/www/phalcon/distinfo
>index 50cfd8ca3c9f..58b382915d16 100644
>--- a/www/phalcon/distinfo
>+++ b/www/phalcon/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1502788222
>-SHA256 (phalcon-cphalcon-v3.2.2_GH0.tar.gz) = b6eb6ba443b60dce547c17dcaae464305fe35fc36d18347159abac835e34fe71
>-SIZE (phalcon-cphalcon-v3.2.2_GH0.tar.gz) = 6568618
>+TIMESTAMP = 1508959112
>+SHA256 (phalcon-cphalcon-v3.2.4_GH0.tar.gz) = 0c1cbe56aa0571bd5e3c5808ee9488b223ae0451e8f3d4eb7179a11875635e1b
>+SIZE (phalcon-cphalcon-v3.2.4_GH0.tar.gz) = 6583823

Actions: View | Diff

Attachments on bug 223322: 187581 | 187582 | 188146