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

[dmichelsen at users.sourceforge.net]

Revision: 16246
          http://gar.svn.sourceforge.net/gar/?rev=16246&view=rev
Author:   dmichelsen
Date:     2011-11-24 14:24:03 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
wireshark/trunk: Update to 1.6.4, remove fixes accepted by upstream

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-11-24 12:54:51 UTC (rev 16245)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2011-11-24 14:24:03 UTC (rev 16246)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.6.2
+VERSION = 1.6.4
 CATEGORIES = apps
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -61,9 +61,6 @@
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
 CHECKPKG_OVERRIDES_CSWwireshark += non-uniform-lib-versions-in-package
 
-# This is probably from kerberos, revalidate after re-release of krb5 library
-# 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
 CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/rawshark.html
@@ -77,9 +74,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
+REINPLACEMENTS += mibs
+REINPLACE_MATCH_mibs = /usr/share/snmp/mibs
+REINPLACE_WITH_mibs = /opt/csw/share/mibs
+REINPLACE_FILES_mibs += epan/oids.c
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no
@@ -88,9 +86,3 @@
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)
-
-post-extract-modulated:
-	@# The path to the libsmi MIBs is hardwired
-	perl -pi \
-		-e 's,/usr/share/snmp/mibs,/opt/csw/share/mibs,;' \
-		$(WORKSRC)/epan/oids.c

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2011-11-24 12:54:51 UTC (rev 16245)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2011-11-24 14:24:03 UTC (rev 16246)
@@ -1 +1 @@
-301677b5f8150265315632fb6247e06e  wireshark-1.6.2.tar.bz2
+a348521c514fcdd890d974f2a0b59db3  wireshark-1.6.4.tar.bz2

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