23209344 Upgrade daq to 2.0.6
authorJingning Ji <jingning.ji@oracle.com>
Wed, 09 Nov 2016 17:37:22 -0800
changeset 7288 6fa98a77f4d9
parent 7286 7b08db47486d
child 7290 b85511c8850f
23209344 Upgrade daq to 2.0.6
components/daq/Makefile
components/daq/daq.p5m
--- a/components/daq/Makefile	Wed Nov 09 17:11:07 2016 -0800
+++ b/components/daq/Makefile	Wed Nov 09 17:37:22 2016 -0800
@@ -25,16 +25,15 @@
 # Prefer 32-bit as only "binary" delivered is a script with embedded paths.
 BUILD_BITS= 32_and_64
 include ../../make-rules/shared-macros.mk
-
 COMPONENT_NAME=		daq
-COMPONENT_VERSION=	2.0.2
+COMPONENT_VERSION=	2.0.6
 COMPONENT_PROJECT_URL=	http://www.snort.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/snort/files/snort/$(COMPONENT_ARCHIVE)/download
+    sha256:b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb
+COMPONENT_ARCHIVE_URL=	https://www.snort.org/downloads/snort/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	library/daq
 
-TPNO=			19384
+TPNO=			32523
 
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
--- a/components/daq/daq.p5m	Wed Nov 09 17:11:07 2016 -0800
+++ b/components/daq/daq.p5m	Wed Nov 09 17:37:22 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -42,17 +42,17 @@
 file path=usr/include/sfbpf_dlt.h
 file path=usr/lib/$(MACH64)/daq/daq_dump.so
 file path=usr/lib/$(MACH64)/daq/daq_pcap.so
-link path=usr/lib/$(MACH64)/libdaq.so target=libdaq.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/libdaq.so.$(COMPONENT_VERSION)
-link path=usr/lib/$(MACH64)/libdaq.so.2 target=libdaq.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libdaq.so target=libdaq.so.2.0.4
+link path=usr/lib/$(MACH64)/libdaq.so.2 target=libdaq.so.2.0.4
+file path=usr/lib/$(MACH64)/libdaq.so.2.0.4
 link path=usr/lib/$(MACH64)/libsfbpf.so target=libsfbpf.so.0.0.1
 link path=usr/lib/$(MACH64)/libsfbpf.so.0 target=libsfbpf.so.0.0.1
 file path=usr/lib/$(MACH64)/libsfbpf.so.0.0.1
 file path=usr/lib/daq/daq_dump.so
 file path=usr/lib/daq/daq_pcap.so
-link path=usr/lib/libdaq.so target=libdaq.so.$(COMPONENT_VERSION)
-file path=usr/lib/libdaq.so.$(COMPONENT_VERSION)
-link path=usr/lib/libdaq.so.2 target=libdaq.so.$(COMPONENT_VERSION)
+link path=usr/lib/libdaq.so target=libdaq.so.2.0.4
+link path=usr/lib/libdaq.so.2 target=libdaq.so.2.0.4
+file path=usr/lib/libdaq.so.2.0.4
 link path=usr/lib/libsfbpf.so target=libsfbpf.so.0.0.1
 link path=usr/lib/libsfbpf.so.0 target=libsfbpf.so.0.0.1
 file path=usr/lib/libsfbpf.so.0.0.1