[csw-devel] SF.net SVN: gar:[18247] csw/mgar/pkg/wireshark/trunk

[janholzh at users.sourceforge.net]

Revision: 18247
          http://gar.svn.sourceforge.net/gar/?rev=18247&view=rev
Author:   janholzh
Date:     2012-06-07 13:40:24 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
wireshark/trunk: Update to 1.6.8 and bind with new openssl

Modified Paths:
--------------
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/checksums

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2012-06-07 12:01:29 UTC (rev 18246)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2012-06-07 13:40:24 UTC (rev 18247)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.6.4
+VERSION = 1.6.8
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -17,7 +17,7 @@
 
 # Use patch until this is fixed:
 #   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6615
-PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch
+#PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch
 
 VENDOR_URL = http://www.wireshark.org/
 
@@ -53,18 +53,18 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
-RUNTIME_DEP_PKGS_CSWwireshark += CSWftype2
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWwireshark += CSWgeoip
-RUNTIME_DEP_PKGS_CSWwireshark += CSWfconfig
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibssl1-0-0
 
 # No more library splitting unless absolutely necessary
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
-CHECKPKG_OVERRIDES_CSWwireshark += non-uniform-lib-versions-in-package
+CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-pkgname-mismatch
 
 # example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible
 CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rawshark.1

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2012-06-07 12:01:29 UTC (rev 18246)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2012-06-07 13:40:24 UTC (rev 18247)
@@ -1 +1 @@
-a348521c514fcdd890d974f2a0b59db3  wireshark-1.6.4.tar.bz2
+dcdc5f4904af5804b622c955a30974e2  wireshark-1.6.8.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.