Page MenuHomeFreeBSD
Files F146206202

D16366.diff
No OneTemporary
Actions

D16366.diff
View Options

Index: head/security/suricata/Makefile
===================================================================
--- head/security/suricata/Makefile
+++ head/security/suricata/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= suricata
-DISTVERSION= 4.0.4
+DISTVERSION= 4.0.5
CATEGORIES= security
MASTER_SITES= http://www.openinfosecfoundation.org/download/
Index: head/security/suricata/distinfo
===================================================================
--- head/security/suricata/distinfo
+++ head/security/suricata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522066170
-SHA256 (suricata-4.0.4.tar.gz) = 617e83b6e20b03aa7d5e05a980d3cb6d2810ec18a6f15a36bf66c81c9c0a2abb
-SIZE (suricata-4.0.4.tar.gz) = 12511121
+TIMESTAMP = 1532091141
+SHA256 (suricata-4.0.5.tar.gz) = 74dacb4359d57fbd3452e384eeeb1dd77b6ae00f02e9994ad5a7b461d5f4c6c2
+SIZE (suricata-4.0.5.tar.gz) = 12494906
Index: head/security/suricata/files/patch-disable_nss_nspr
===================================================================
--- head/security/suricata/files/patch-disable_nss_nspr
+++ head/security/suricata/files/patch-disable_nss_nspr
@@ -1,169 +0,0 @@
-From 2bd73173674843695cb3e44666f233697a64b6a0 Mon Sep 17 00:00:00 2001
-From: Renato Botelho <garga@FreeBSD.org>
-Date: Thu, 22 Mar 2018 11:02:42 -0300
-Subject: [PATCH] configure: allow to disable libnss and libnspr
-
-Let user chose to disable libnss and libnspr support even if these
-libraries are installed in the system. Default remains to enable when
-libraries are found and disable parameter were not used
----
- configure.ac | 122 ++++++++++++++++++++++++++++++-----------------------------
- 1 file changed, 63 insertions(+), 59 deletions(-)
-
-diff --git configure.ac configure.ac
-index 278f408940..1e3a467406 100644
---- configure.ac
-+++ configure.ac
-@@ -1586,15 +1586,8 @@
- fi
-
- # libnspr
-- enable_nspr="no"
--
-- # Try pkg-config first:
-- PKG_CHECK_MODULES([libnspr], nspr,, [with_pkgconfig_nspr=no])
-- if test "$with_pkgconfig_nspr" != "no"; then
-- CPPFLAGS="${CPPFLAGS} ${libnspr_CFLAGS}"
-- LIBS="${LIBS} ${libnspr_LIBS}"
-- fi
--
-+ AC_ARG_ENABLE(nspr,
-+ AS_HELP_STRING([--disable-nspr],[Disable libnspr support]))
- AC_ARG_WITH(libnspr_includes,
- [ --with-libnspr-includes=DIR libnspr include directory],
- [with_libnspr_includes="$withval"],[with_libnspr_includes=no])
-@@ -1602,41 +1595,43 @@
- [ --with-libnspr-libraries=DIR libnspr library directory],
- [with_libnspr_libraries="$withval"],[with_libnspr_libraries="no"])
-
-- if test "$with_libnspr_includes" != "no"; then
-- CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}"
-- fi
-+ if test "$enable_nspr" != "no"; then
-+ # Try pkg-config first:
-+ PKG_CHECK_MODULES([libnspr], nspr,, [with_pkgconfig_nspr=no])
-+ if test "$with_pkgconfig_nspr" != "no"; then
-+ CPPFLAGS="${CPPFLAGS} ${libnspr_CFLAGS}"
-+ LIBS="${LIBS} ${libnspr_LIBS}"
-+ fi
-
-- AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no")
-- if test "$NSPR" = "yes"; then
-- if test "$with_libnspr_libraries" != "no"; then
-- LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}"
-- fi
-+ if test "$with_libnspr_includes" != "no"; then
-+ CPPFLAGS="${CPPFLAGS} -I${with_libnspr_includes}"
-+ fi
-
-- AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no")
-+ AC_CHECK_HEADER(nspr.h,NSPR="yes",NSPR="no")
-+ if test "$NSPR" = "yes"; then
-+ if test "$with_libnspr_libraries" != "no"; then
-+ LDFLAGS="${LDFLAGS} -L${with_libnspr_libraries}"
-+ fi
-
-- if test "$NSPR" = "no"; then
-- echo
-- echo " ERROR! libnspr library not found, go get it"
-- echo " from Mozilla or your distribution:"
-- echo
-- echo " Ubuntu: apt-get install libnspr4-dev"
-- echo " Fedora: yum install nspr-devel"
-- echo
-- exit 1
-- fi
-- enable_nspr="yes"
-+ AC_CHECK_LIB(nspr4, PR_GetCurrentThread,, NSPR="no")
-+
-+ if test "$NSPR" = "no"; then
-+ echo
-+ echo " ERROR! libnspr library not found, go get it"
-+ echo " from Mozilla or your distribution:"
-+ echo
-+ echo " Ubuntu: apt-get install libnspr4-dev"
-+ echo " Fedora: yum install nspr-devel"
-+ echo
-+ exit 1
-+ fi
-+ enable_nspr="yes"
-+ fi
- fi
-
- # libnss
-- enable_nss="no"
--
-- # Try pkg-config first:
-- PKG_CHECK_MODULES([libnss], nss,, [with_pkgconfig_nss=no])
-- if test "$with_pkgconfig_nss" != "no"; then
-- CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}"
-- LIBS="${LIBS} ${libnss_LIBS}"
-- fi
--
-+ AC_ARG_ENABLE(nss,
-+ AS_HELP_STRING([--disable-nss],[Disable libnss support]))
- AC_ARG_WITH(libnss_includes,
- [ --with-libnss-includes=DIR libnss include directory],
- [with_libnss_includes="$withval"],[with_libnss_includes=no])
-@@ -1644,31 +1639,40 @@
- [ --with-libnss-libraries=DIR libnss library directory],
- [with_libnss_libraries="$withval"],[with_libnss_libraries="no"])
-
-- if test "$with_libnss_includes" != "no"; then
-- CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}"
-- fi
-+ if test "$enable_nss" != "no"; then
-+ # Try pkg-config first:
-+ PKG_CHECK_MODULES([libnss], nss,, [with_pkgconfig_nss=no])
-+ if test "$with_pkgconfig_nss" != "no"; then
-+ CPPFLAGS="${CPPFLAGS} ${libnss_CFLAGS}"
-+ LIBS="${LIBS} ${libnss_LIBS}"
-+ fi
-
-- AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no")
-- if test "$NSS" = "yes"; then
-- if test "$with_libnss_libraries" != "no"; then
-- LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}"
-- fi
-+ if test "$with_libnss_includes" != "no"; then
-+ CPPFLAGS="${CPPFLAGS} -I${with_libnss_includes}"
-+ fi
-
-- AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no")
-+ AC_CHECK_HEADER(sechash.h,NSS="yes",NSS="no")
-+ if test "$NSS" = "yes"; then
-+ if test "$with_libnss_libraries" != "no"; then
-+ LDFLAGS="${LDFLAGS} -L${with_libnss_libraries}"
-+ fi
-
-- if test "$NSS" = "no"; then
-- echo
-- echo " ERROR! libnss library not found, go get it"
-- echo " from Mozilla or your distribution:"
-- echo
-- echo " Ubuntu: apt-get install libnss3-dev"
-- echo " Fedora: yum install nss-devel"
-- echo
-- exit 1
-- fi
-+ AC_CHECK_LIB(nss3, HASH_Begin,, NSS="no")
-+
-+ if test "$NSS" = "no"; then
-+ echo
-+ echo " ERROR! libnss library not found, go get it"
-+ echo " from Mozilla or your distribution:"
-+ echo
-+ echo " Ubuntu: apt-get install libnss3-dev"
-+ echo " Fedora: yum install nss-devel"
-+ echo
-+ exit 1
-+ fi
-
-- AC_DEFINE([HAVE_NSS],[1],[libnss available for md5])
-- enable_nss="yes"
-+ AC_DEFINE([HAVE_NSS],[1],[libnss available for md5])
-+ enable_nss="yes"
-+ fi
- fi
-
- # libmagic

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 6:19 PM (9 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29057547
Default Alt Text
D16366.diff (7 KB)

Event Timeline