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

[dmichelsen at users.sourceforge.net]

Revision: 14759
          http://gar.svn.sourceforge.net/gar/?rev=14759&view=rev
Author:   dmichelsen
Date:     2011-06-09 14:38:08 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
wireshark: Update to 1.6.0, unsplit libs

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	2011-06-09 14:29:25 UTC (rev 14758)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2011-06-09 14:38:08 UTC (rev 14759)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.4.7
+VERSION = 1.6.0
 CATEGORIES = apps
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -28,60 +28,18 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwireshark0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwiretap0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibwsutil0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2
+RUNTIME_DEP_PKGS_CSWwireshark += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
 
-PACKAGES += CSWlibwireshark0
-PKGFILES_CSWlibwireshark0 += $(call pkgfiles_lib,libwireshark.so.0)
-SPKG_DESC_CSWlibwireshark0 += Wireshark library, libwireshark.so.0
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi2
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgpg-error0
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlua
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwiretap0
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibwsutil0
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWgcrypt
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibcares2
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWglib2
-# This dependency can not be verified by checkpkg
-RUNTIME_DEP_PKGS_CSWlibwireshark0 += CSWlibsmi-mibs
-CHECKPKG_OVERRIDES_CSWlibwireshark0 += surplus-dependency|CSWlibsmi-mibs
+# 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
 
-PACKAGES += CSWlibwiretap0
-PKGFILES_CSWlibwiretap0 += $(call pkgfiles_lib,libwiretap.so.0)
-SPKG_DESC_CSWlibwiretap0 += Wireshark library, libwiretap.so.0
-RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWlibwsutil0
-RUNTIME_DEP_PKGS_CSWlibwiretap0 += CSWzlib
-
-PACKAGES += CSWlibwsutil0
-PKGFILES_CSWlibwsutil0 += $(call pkgfiles_lib,libwsutil.so.0)
-SPKG_DESC_CSWlibwsutil0 += Wireshark library, libwsutil.so.0
-RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibwsutil0 += CSWzlib
-
-# This is almost empty, do not split for now
-#PACKAGES += CSWwireshark-dev
-#SPKG_DESC_CSWwireshark-dev = Development files for Wireshark
-#PKGFILES_CSWwireshark-dev += $(PKGFILES_DEVEL)
-#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWwireshark
-#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwiretap0
-#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwireshark0
-#RUNTIME_DEP_PKGS_CSWwireshark-dev += CSWlibwsutil0
-
 # This is probably from kerberos, revalidate after re-release of krb5 library
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/dftest
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/rawshark
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/tshark
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark
-CHECKPKG_OVERRIDES_CSWlibwireshark0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry
 
 # 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
@@ -96,6 +54,10 @@
 CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tshark.1
 CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/tshark.html
 
+# Hardwire largefiles unless this is fixed:
+#   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6012
+EXTRA_CPPFLAGS = -D_FILE_OFFSET_BITS=64
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2011-06-09 14:29:25 UTC (rev 14758)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2011-06-09 14:38:08 UTC (rev 14759)
@@ -1 +1 @@
-b5065426d5524ddc1667314f8256c2b1  wireshark-1.4.7.tar.bz2
+9f9314c89bf1c8b440a7909884838cfd  wireshark-1.6.0.tar.bz2


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