Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
16953408 Upgrade Wireshark to version 1.10.0 s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Mon, 08 Jul 2013 15:13:23 -0700
branchs11-update
changeset 2669 098e8b6b0df7
parent 2668 be2379d0aa1f
child 2670 eaef8ade1d5d
16953408 Upgrade Wireshark to version 1.10.0 16080054 Include 64bit wireshark in Solaris (sparc and x86) 16839352 problem in UTILITY/WIRESHARK
components/wireshark/Makefile file | annotate | diff | comparison | revisions
components/wireshark/patches/DesktopEntry.patch file | annotate | diff | comparison | revisions
components/wireshark/wireshark-common.p5m file | annotate | diff | comparison | revisions
components/wireshark/wireshark.license file | annotate | diff | comparison | revisions 
--- a/components/wireshark/Makefile	Mon Jul 08 14:13:53 2013 -0700
+++ b/components/wireshark/Makefile	Mon Jul 08 15:13:23 2013 -0700
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		wireshark
-COMPONENT_VERSION=	1.8.5
+COMPONENT_VERSION=	1.10.0
 COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372
+    sha256:1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/wireshark
 
@@ -36,6 +36,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
 PATCH_LEVEL=0
 
 CONFIGURE_OPTIONS +=	--bindir=/usr/sbin
@@ -46,20 +49,28 @@
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="/usr/perl5/bin:/usr/gnu/bin:$(PATH)"
 
+# Use the 64-bit versions of pkg-config files
+CONFIGURE_ENV +=	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+
+# Version 1.10 (libwireshark.so) doesn't play nicely with -Bdirect.
+LD_B_DIRECT=
+
 # We need to avoid RPATH=/usr/lib in Wireshark libraries so that we can
 # create successfully IPS package of different Wireshark branch than is
 # installed on build system without dependency errors.
 COMPONENT_POST_CONFIGURE_ACTION = \
 	(cd $(@D); \
-	sed -e 's,-L/usr/lib -R/usr/lib,,' -e 's,-R/usr/lib,,' \
+	sed -e 's,-R/usr/lib/$(MACH64),,' \
+	    -e 's,-R/usr/lib,,' \
+	    -e 's,-R\$$libdir,,' \
 		config.status > config.status.new; \
 	mv config.status.new config.status; \
 	chmod 755 config.status; \
 	./config.status)
 
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/wireshark/patches/DesktopEntry.patch	Mon Jul 08 14:13:53 2013 -0700
+++ b/components/wireshark/patches/DesktopEntry.patch	Mon Jul 08 15:13:23 2013 -0700
@@ -1,13 +1,13 @@
---- wireshark.desktop	Tue Nov  1 09:36:05 2011
-+++ wireshark.desktop	Mon Nov  7 01:58:14 2011
[email protected]@ -69,8 +69,8 @@
+--- wireshark.desktop
++++ wireshark.desktop
[email protected]@ -70,8 +70,8 @@
  Comment[fr]=Analyseur de trafic réseau
  Comment[sv]=Nätverkstrafikanalysator
- Icon=wireshark.png
+ Icon=wireshark
 -TryExec=wireshark
 -Exec=wireshark %f
 +TryExec=/usr/sbin/wireshark
 +Exec=pfexec /usr/sbin/wireshark %f
  Terminal=false
- MimeType=application/vnd.tcpdump.pcap;
- # Categorie entry according to version 1.0 of
+ MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;
+ # Category entry according to:
--- a/components/wireshark/wireshark-common.p5m	Mon Jul 08 14:13:53 2013 -0700
+++ b/components/wireshark/wireshark-common.p5m	Mon Jul 08 15:13:23 2013 -0700
@@ -34,44 +34,24 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/wireshark
-dir path=usr/lib/wireshark/plugins
-dir path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)
-dir path=usr/sbin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man4
-dir path=usr/share/pixmaps
-dir path=usr/share/wireshark
-dir path=usr/share/wireshark/diameter
-dir path=usr/share/wireshark/dtds
-dir path=usr/share/wireshark/help
-dir path=usr/share/wireshark/radius
-dir path=usr/share/wireshark/tpncp
-dir path=usr/share/wireshark/wimaxasncp
 file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/libwireshark.so.2.0.5
-file path=usr/lib/libwiretap.so.2.1.5
-file path=usr/lib/libwsutil.so.2.0.0
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/ethercat.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/gryphon.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/irda.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/m2m.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/mate.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/opcua.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/profinet.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/stats_tree.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/unistim.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimax.so
-file path=usr/lib/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimaxasncp.so
+file path=usr/lib/$(MACH64)/libwireshark.so.3.0.0
+file path=usr/lib/$(MACH64)/libwiretap.so.3.0.0
+file path=usr/lib/$(MACH64)/libwsutil.so.3.0.0
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/ethercat.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/gryphon.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/irda.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/m2m.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/mate.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/opcua.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/profinet.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/stats_tree.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/unistim.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimax.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimaxasncp.so
+file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/wimaxmacphy.so
 file path=usr/sbin/capinfos
 file path=usr/sbin/dumpcap
 file path=usr/sbin/editcap
@@ -94,8 +74,12 @@
 file path=usr/share/wireshark/dfilters
 file path=usr/share/wireshark/dftest.html
 file path=usr/share/wireshark/diameter/AlcatelLucent.xml
+file path=usr/share/wireshark/diameter/ChinaTelecom.xml
 file path=usr/share/wireshark/diameter/Cisco.xml
 file path=usr/share/wireshark/diameter/Ericsson.xml
+file path=usr/share/wireshark/diameter/Nokia.xml
+file path=usr/share/wireshark/diameter/NokiaSiemensNetworks.xml
+file path=usr/share/wireshark/diameter/SKT.xml
 file path=usr/share/wireshark/diameter/TGPPGmb.xml
 file path=usr/share/wireshark/diameter/TGPPRx.xml
 file path=usr/share/wireshark/diameter/TGPPS9.xml
@@ -140,7 +124,10 @@
 file path=usr/share/wireshark/manuf
 file path=usr/share/wireshark/mergecap.html
 file path=usr/share/wireshark/pdml2html.xsl
+file path=usr/share/wireshark/profiles/Bluetooth/colorfilters
+file path=usr/share/wireshark/profiles/Classic/colorfilters
 file path=usr/share/wireshark/radius/README.radius_dictionary
+file path=usr/share/wireshark/radius/custom.includes
 file path=usr/share/wireshark/radius/dictionary
 file path=usr/share/wireshark/radius/dictionary.3com
 file path=usr/share/wireshark/radius/dictionary.3gpp
@@ -249,9 +236,12 @@
 file path=usr/share/wireshark/radius/dictionary.rfc4849
 file path=usr/share/wireshark/radius/dictionary.rfc5090
 file path=usr/share/wireshark/radius/dictionary.rfc5176
+file path=usr/share/wireshark/radius/dictionary.rfc5447
 file path=usr/share/wireshark/radius/dictionary.rfc5580
 file path=usr/share/wireshark/radius/dictionary.rfc5607
 file path=usr/share/wireshark/radius/dictionary.rfc5904
+file path=usr/share/wireshark/radius/dictionary.rfc6519
+file path=usr/share/wireshark/radius/dictionary.rfc6572
 file path=usr/share/wireshark/radius/dictionary.riverstone
 file path=usr/share/wireshark/radius/dictionary.roaringpenguin
 file path=usr/share/wireshark/radius/dictionary.shasta
@@ -295,12 +285,12 @@
 file path=usr/share/wireshark/ws.css
 
 license wireshark.license license=GPLv2
-link path=usr/lib/libwireshark.so target=libwireshark.so.2.0.5
-link path=usr/lib/libwireshark.so.2 target=libwireshark.so.2.0.5
-link path=usr/lib/libwiretap.so target=libwiretap.so.2.1.5
-link path=usr/lib/libwiretap.so.2 target=libwiretap.so.2.1.5
-link path=usr/lib/libwsutil.so target=libwsutil.so.2.0.0
-link path=usr/lib/libwsutil.so.2 target=libwsutil.so.2.0.0
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.0.0
+link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.0.0
+link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.0
+link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.0
+link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.3.0.0
+link path=usr/lib/$(MACH64)/libwsutil.so.3 target=libwsutil.so.3.0.0
 
 depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 depend type=optional fmri=diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/wireshark/wireshark.license	Mon Jul 08 14:13:53 2013 -0700
+++ b/components/wireshark/wireshark.license	Mon Jul 08 15:13:23 2013 -0700
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -56,7 +56,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -312,7 +312,7 @@
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,7 +335,7 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
 
 ------------------------------------------------------------------------
upstream/oracle/userland-gate