Attachment 195474 Details for Bug 230057 – wireshark-2.6.2

[patch] wireshark-2.6.2

wireshark-2.6.2.patch (text/plain), 9.92 KB, created by Sergey Akhmatov on 2018-07-26 14:35:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Akhmatov

Created: 2018-07-26 14:35:24 UTC

Size: 9.92 KB

patch

obsolete

>Index: net/wireshark/Makefile
>===================================================================
>--- net/wireshark/Makefile	(revision 475349)
>+++ net/wireshark/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME?=	wireshark
>-PORTVERSION=	2.6.0
>-PORTREVISION?=	1
>+PORTVERSION=	2.6.2
>+PORTREVISION?=	0
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.wireshark.org/download/src/ \
> 		http://ftp.uni-kl.de/pub/wireshark/src/ \
>Index: net/wireshark/distinfo
>===================================================================
>--- net/wireshark/distinfo	(revision 475349)
>+++ net/wireshark/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1525189786
>-SHA256 (wireshark-2.6.0.tar.xz) = 711c7f01d27a8817d58277a5487cef3e3c7bab1c8caaf8f4c92aa21015b9117f
>-SIZE (wireshark-2.6.0.tar.xz) = 28314868
>+TIMESTAMP = 1532470666
>+SHA256 (wireshark-2.6.2.tar.xz) = 49b2895ee3ba17ef9ef0aebfdc4d32a778e0f36ccadde184516557d5f3357094
>+SIZE (wireshark-2.6.2.tar.xz) = 28392140
>Index: net/wireshark/files/patch-plugins_codecs_l16__mono_CMakeLists.txt
>===================================================================
>--- net/wireshark/files/patch-plugins_codecs_l16__mono_CMakeLists.txt	(revision 475349)
>+++ net/wireshark/files/patch-plugins_codecs_l16__mono_CMakeLists.txt	(nonexistent)
>@@ -1,11 +0,0 @@
>---- plugins/codecs/l16_mono/CMakeLists.txt.orig	2018-05-22 12:49:38 UTC
>-+++ plugins/codecs/l16_mono/CMakeLists.txt
>-@@ -28,7 +28,7 @@ set_source_files_properties(
>- )
>- 
>- include_directories(
>--	${CMAKE_SOURCE_DIR}/codec
>-+	${CMAKE_SOURCE_DIR}/codecs
>- 	${CMAKE_CURRENT_SOURCE_DIR}
>- )
>- 
>Index: net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.am
>===================================================================
>--- net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.am	(revision 475349)
>+++ net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.am	(nonexistent)
>@@ -1,11 +0,0 @@
>---- plugins/codecs/l16_mono/Makefile.am.orig	2018-05-22 12:50:18 UTC
>-+++ plugins/codecs/l16_mono/Makefile.am
>-@@ -26,7 +26,7 @@ NONGENERATED_REGISTER_C_FILES = \
>- NONGENERATED_C_FILES = \
>- 	$(NONGENERATED_REGISTER_C_FILES)
>- 
>--wiretap_plugin_LTLIBRARIES = l16mono.la
>-+codecs_plugin_LTLIBRARIES = l16mono.la
>- 
>- l16mono_la_SOURCES = \
>- 	$(SRC_FILES)	\
>Index: net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.in
>===================================================================
>--- net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.in	(revision 475349)
>+++ net/wireshark/files/patch-plugins_codecs_l16__mono_Makefile.in	(nonexistent)
>@@ -1,150 +0,0 @@
>---- plugins/codecs/l16_mono/Makefile.in.orig	2018-05-22 16:01:15 UTC
>-+++ plugins/codecs/l16_mono/Makefile.in
>-@@ -197,8 +197,8 @@ am__uninstall_files_from_dir = { \
>-     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
>-          $(am__cd) "$$dir" && rm -f $$files; }; \
>-   }
>--am__installdirs = "$(DESTDIR)$(wiretap_plugindir)"
>--LTLIBRARIES = $(wiretap_plugin_LTLIBRARIES)
>-+am__installdirs = "$(DESTDIR)$(codecs_plugindir)"
>-+LTLIBRARIES = $(codecs_plugin_LTLIBRARIES)
>- l16mono_la_LIBADD =
>- am__objects_1 = l16mono_la-l16decode.lo
>- am__objects_2 = $(am__objects_1)
>-@@ -523,7 +523,6 @@ rawshark_bin = @rawshark_bin@
>- rawshark_man = @rawshark_man@
>- reordercap_bin = @reordercap_bin@
>- reordercap_man = @reordercap_man@
>--runstatedir = @runstatedir@
>- sbindir = @sbindir@
>- sharedstatedir = @sharedstatedir@
>- sharkd_bin = @sharkd_bin@
>-@@ -741,7 +740,7 @@ NONGENERATED_REGISTER_C_FILES = \
>- NONGENERATED_C_FILES = \
>- 	$(NONGENERATED_REGISTER_C_FILES)
>- 
>--wiretap_plugin_LTLIBRARIES = l16mono.la
>-+codecs_plugin_LTLIBRARIES = l16mono.la
>- l16mono_la_SOURCES = \
>- 	$(SRC_FILES)	\
>- 	$(HEADER_FILES)
>-@@ -794,33 +793,33 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>- $(am__aclocal_m4_deps):
>- 
>--install-wiretap_pluginLTLIBRARIES: $(wiretap_plugin_LTLIBRARIES)
>-+install-codecs_pluginLTLIBRARIES: $(codecs_plugin_LTLIBRARIES)
>- 	@$(NORMAL_INSTALL)
>--	@list='$(wiretap_plugin_LTLIBRARIES)'; test -n "$(wiretap_plugindir)" || list=; \
>-+	@list='$(codecs_plugin_LTLIBRARIES)'; test -n "$(codecs_plugindir)" || list=; \
>- 	list2=; for p in $$list; do \
>- 	  if test -f $$p; then \
>- 	    list2="$$list2 $$p"; \
>- 	  else :; fi; \
>- 	done; \
>- 	test -z "$$list2" || { \
>--	  echo " $(MKDIR_P) '$(DESTDIR)$(wiretap_plugindir)'"; \
>--	  $(MKDIR_P) "$(DESTDIR)$(wiretap_plugindir)" || exit 1; \
>--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(wiretap_plugindir)'"; \
>--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(wiretap_plugindir)"; \
>-+	  echo " $(MKDIR_P) '$(DESTDIR)$(codecs_plugindir)'"; \
>-+	  $(MKDIR_P) "$(DESTDIR)$(codecs_plugindir)" || exit 1; \
>-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(codecs_plugindir)'"; \
>-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(codecs_plugindir)"; \
>- 	}
>- 
>--uninstall-wiretap_pluginLTLIBRARIES:
>-+uninstall-codecs_pluginLTLIBRARIES:
>- 	@$(NORMAL_UNINSTALL)
>--	@list='$(wiretap_plugin_LTLIBRARIES)'; test -n "$(wiretap_plugindir)" || list=; \
>-+	@list='$(codecs_plugin_LTLIBRARIES)'; test -n "$(codecs_plugindir)" || list=; \
>- 	for p in $$list; do \
>- 	  $(am__strip_dir) \
>--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(wiretap_plugindir)/$$f'"; \
>--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(wiretap_plugindir)/$$f"; \
>-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(codecs_plugindir)/$$f'"; \
>-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(codecs_plugindir)/$$f"; \
>- 	done
>- 
>--clean-wiretap_pluginLTLIBRARIES:
>--	-test -z "$(wiretap_plugin_LTLIBRARIES)" || rm -f $(wiretap_plugin_LTLIBRARIES)
>--	@list='$(wiretap_plugin_LTLIBRARIES)'; \
>-+clean-codecs_pluginLTLIBRARIES:
>-+	-test -z "$(codecs_plugin_LTLIBRARIES)" || rm -f $(codecs_plugin_LTLIBRARIES)
>-+	@list='$(codecs_plugin_LTLIBRARIES)'; \
>- 	locs=`for p in $$list; do echo $$p; done | \
>- 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
>- 	      sort -u`; \
>-@@ -830,7 +829,7 @@ clean-wiretap_pluginLTLIBRARIES:
>- 	}
>- 
>- l16mono.la: $(l16mono_la_OBJECTS) $(l16mono_la_DEPENDENCIES) $(EXTRA_l16mono_la_DEPENDENCIES) 
>--	$(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(wiretap_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) $(LIBS)
>-+	$(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(codecs_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) $(LIBS)
>- 
>- mostlyclean-compile:
>- 	-rm -f *.$(OBJEXT)
>-@@ -972,7 +971,7 @@ check: $(BUILT_SOURCES)
>- 	$(MAKE) $(AM_MAKEFLAGS) check-am
>- all-am: Makefile $(LTLIBRARIES)
>- installdirs:
>--	for dir in "$(DESTDIR)$(wiretap_plugindir)"; do \
>-+	for dir in "$(DESTDIR)$(codecs_plugindir)"; do \
>- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
>- 	done
>- install: $(BUILT_SOURCES)
>-@@ -1010,7 +1009,7 @@ maintainer-clean-generic:
>- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
>- clean: clean-am
>- 
>--clean-am: clean-generic clean-libtool clean-wiretap_pluginLTLIBRARIES \
>-+clean-am: clean-codecs_pluginLTLIBRARIES clean-generic clean-libtool \
>- 	mostlyclean-am
>- 
>- distclean: distclean-am
>-@@ -1031,7 +1030,7 @@ info: info-am
>- 
>- info-am:
>- 
>--install-data-am: install-wiretap_pluginLTLIBRARIES
>-+install-data-am: install-codecs_pluginLTLIBRARIES
>- 
>- install-dvi: install-dvi-am
>- 
>-@@ -1077,24 +1076,24 @@ ps: ps-am
>- 
>- ps-am:
>- 
>--uninstall-am: uninstall-wiretap_pluginLTLIBRARIES
>-+uninstall-am: uninstall-codecs_pluginLTLIBRARIES
>- 
>- .MAKE: all check install install-am install-strip
>- 
>--.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
>--	clean-libtool clean-wiretap_pluginLTLIBRARIES cscopelist-am \
>--	ctags ctags-am distclean distclean-compile distclean-generic \
>--	distclean-libtool distclean-tags distdir dvi dvi-am html \
>--	html-am info info-am install install-am install-data \
>--	install-data-am install-dvi install-dvi-am install-exec \
>--	install-exec-am install-html install-html-am install-info \
>--	install-info-am install-man install-pdf install-pdf-am \
>--	install-ps install-ps-am install-strip \
>--	install-wiretap_pluginLTLIBRARIES installcheck installcheck-am \
>-+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
>-+	clean-codecs_pluginLTLIBRARIES clean-generic clean-libtool \
>-+	cscopelist-am ctags ctags-am distclean distclean-compile \
>-+	distclean-generic distclean-libtool distclean-tags distdir dvi \
>-+	dvi-am html html-am info info-am install install-am \
>-+	install-codecs_pluginLTLIBRARIES install-data install-data-am \
>-+	install-dvi install-dvi-am install-exec install-exec-am \
>-+	install-html install-html-am install-info install-info-am \
>-+	install-man install-pdf install-pdf-am install-ps \
>-+	install-ps-am install-strip installcheck installcheck-am \
>- 	installdirs maintainer-clean maintainer-clean-generic \
>- 	mostlyclean mostlyclean-compile mostlyclean-generic \
>- 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
>--	uninstall-am uninstall-wiretap_pluginLTLIBRARIES
>-+	uninstall-am uninstall-codecs_pluginLTLIBRARIES
>- 
>- .PRECIOUS: Makefile
>- 
>Index: net/wireshark/pkg-plist
>===================================================================
>--- net/wireshark/pkg-plist	(revision 475349)
>+++ net/wireshark/pkg-plist	(working copy)
>@@ -636,14 +636,14 @@
> include/wireshark/wsutil/wspcap.h
> include/wireshark/wsutil/xtea.h
> lib/libwireshark.so
>-lib/libwireshark.so.11
>-lib/libwireshark.so.11.0.0
>+lib/libwireshark.so.10
>+lib/libwireshark.so.10.1.2
> lib/libwiretap.so
> lib/libwiretap.so.8
>-lib/libwiretap.so.8.0.0
>+lib/libwiretap.so.8.0.2
> %%GUI%%lib/libwscodecs.so
>-%%GUI%%lib/libwscodecs.so.0
>-%%GUI%%lib/libwscodecs.so.0.0.0
>+%%GUI%%lib/libwscodecs.so.2
>+%%GUI%%lib/libwscodecs.so.2.0.0
> lib/libwsutil.so
> lib/libwsutil.so.9
> lib/libwsutil.so.9.0.0

Flags:

sergey: maintainer-approval? (marcus)

Actions: View | Diff

Attachments on bug 230057: 195474