diff options
| -rw-r--r-- | patches/wireshark-0.99.3a/series | 4 | ||||
| -rw-r--r-- | patches/wireshark-0.99.3a/wireshark-0.99.3a-aclocal.diff.bz2 | bin | 2411 -> 0 bytes | |||
| -rw-r--r-- | patches/wireshark-0.99.3a/wireshark-0.99.3a-autoconf.diff.bz2 | bin | 6921 -> 0 bytes | |||
| -rw-r--r-- | patches/wireshark-0.99.3a/wireshark-0.99.3a-automake.diff.bz2 | bin | 3953 -> 0 bytes | |||
| -rw-r--r-- | patches/wireshark-0.99.3a/wireshark-0.99.3a-cross.diff | 66 | ||||
| l--------- | patches/wireshark-1.2.5/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/wireshark-1.2.5/hack-crosscompiling.diff | 112 | ||||
| -rw-r--r-- | patches/wireshark-1.2.5/remove-prefix-from-include-path.diff | 48 | ||||
| -rw-r--r-- | patches/wireshark-1.2.5/series | 2 | ||||
| -rw-r--r-- | rules/wireshark.in | 3 | ||||
| -rw-r--r-- | rules/wireshark.make | 92 |
11 files changed, 180 insertions, 148 deletions
diff --git a/patches/wireshark-0.99.3a/series b/patches/wireshark-0.99.3a/series deleted file mode 100644 index 81eb95f26..000000000 --- a/patches/wireshark-0.99.3a/series +++ /dev/null @@ -1,4 +0,0 @@ -wireshark-0.99.3a-cross.diff -wireshark-0.99.3a-aclocal.diff.bz2 -wireshark-0.99.3a-automake.diff.bz2 -wireshark-0.99.3a-autoconf.diff.bz2 diff --git a/patches/wireshark-0.99.3a/wireshark-0.99.3a-aclocal.diff.bz2 b/patches/wireshark-0.99.3a/wireshark-0.99.3a-aclocal.diff.bz2 Binary files differdeleted file mode 100644 index 0d53e09d6..000000000 --- a/patches/wireshark-0.99.3a/wireshark-0.99.3a-aclocal.diff.bz2 +++ /dev/null diff --git a/patches/wireshark-0.99.3a/wireshark-0.99.3a-autoconf.diff.bz2 b/patches/wireshark-0.99.3a/wireshark-0.99.3a-autoconf.diff.bz2 Binary files differdeleted file mode 100644 index 5a33a02d2..000000000 --- a/patches/wireshark-0.99.3a/wireshark-0.99.3a-autoconf.diff.bz2 +++ /dev/null diff --git a/patches/wireshark-0.99.3a/wireshark-0.99.3a-automake.diff.bz2 b/patches/wireshark-0.99.3a/wireshark-0.99.3a-automake.diff.bz2 Binary files differdeleted file mode 100644 index ac059aa10..000000000 --- a/patches/wireshark-0.99.3a/wireshark-0.99.3a-automake.diff.bz2 +++ /dev/null diff --git a/patches/wireshark-0.99.3a/wireshark-0.99.3a-cross.diff b/patches/wireshark-0.99.3a/wireshark-0.99.3a-cross.diff deleted file mode 100644 index f2009cdfd..000000000 --- a/patches/wireshark-0.99.3a/wireshark-0.99.3a-cross.diff +++ /dev/null @@ -1,66 +0,0 @@ -Subject: [patch] fix CC_FOR_BUILD problem -From: Robert Schwebel <r.schwebel@pengutronix.de> - -Some tools for the "build" machine are by accident built for the "host" -box. Add CC_FOR_BUILD mechanics. - -Description: -http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1185 - -Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - ---- - -Index: Makefile.am -=================================================================== ---- a/Makefile.am.orig -+++ b/Makefile.am -@@ -429,7 +429,7 @@ ps.c: print.ps rdps - ./rdps $(srcdir)/print.ps ps.c - - rdps: rdps.c -- $(CC) $(CFLAGS) -o rdps $(srcdir)/rdps.c -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o rdps $(srcdir)/rdps.c - - randpkt_additional_libs = wiretap/libwiretap.la - -Index: tools/lemon/Makefile.am -=================================================================== ---- a/tools/lemon/Makefile.am.orig -+++ b/tools/lemon/Makefile.am -@@ -34,8 +34,8 @@ CLEANFILES = \ - MAINTAINERCLEANFILES = \ - Makefile.in - --lemon_SOURCES = \ -- lemon.c -+lemon: lemon.c -+ $(CC_FOR_BUILD) -D_U_="" $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $< - - EXTRA_DIST = \ - cppmagic.h \ -Index: configure.in -=================================================================== ---- a/configure.in.orig -+++ b/configure.in -@@ -6,6 +6,7 @@ AC_PREREQ(2.52) - - dnl Check for CPU / vendor / OS - AC_CANONICAL_HOST -+AC_CANONICAL_BUILD - AC_CANONICAL_TARGET - - AM_INIT_AUTOMAKE(wireshark, 0.99.3a) -@@ -58,6 +59,12 @@ AC_SUBST(PYTHON) - AC_SUBST(XSLTPROC) - AC_SUBST(XMLLINT) - -+if test "x$CC_FOR_BUILD" = x -+then -+ CC_FOR_BUILD=$(CC) -+fi -+AC_SUBST(CC_FOR_BUILD) -+ - # Check for doxygen - AC_PATH_PROG(DOXYGEN, doxygen) - AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no") diff --git a/patches/wireshark-1.2.5/autogen.sh b/patches/wireshark-1.2.5/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/wireshark-1.2.5/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/wireshark-1.2.5/hack-crosscompiling.diff b/patches/wireshark-1.2.5/hack-crosscompiling.diff new file mode 100644 index 000000000..dd54a6ddc --- /dev/null +++ b/patches/wireshark-1.2.5/hack-crosscompiling.diff @@ -0,0 +1,112 @@ +Subject: remove AC_TRY_RUN tests +From: Michael Olbrich <m.olbrich@pengutronix.de> + +AC_TRY_RUN does not work when cross-compiling. +The other test result seems to break the build, so I guess +this is save for us. + +Not for upstream. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + configure.in | 78 ----------------------------------------------------------- + 1 file changed, 78 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -1404,92 +1404,14 @@ AC_SUBST(STRNCASECMP_O) + + AC_CHECK_FUNCS(mkstemp mkdtemp) + +-# +-# XXX - if inet_aton isn't found, the build fails, with a complaint from +-# libtool about inet_aton.lo not being a valid libtool object. We +-# probably have to handle it - and all the other replacement functions that +-# get built into libwireshark - differently. +-# +-AC_SEARCH_LIBS(inet_aton, [socket nsl], have_inet_aton=yes, +- have_inet_aton=no) +-if test "$have_inet_aton" = no; then +- INET_ATON_C="inet_aton.c" +- INET_ATON_O="inet_aton.o" +- INET_ATON_LO="inet_aton.lo" +- AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included]) +-else +- INET_ATON_C="" +- INET_ATON_O="" +- INET_ATON_LO="" +-fi + AC_SUBST(INET_ATON_C) + AC_SUBST(INET_ATON_O) + AC_SUBST(INET_ATON_LO) + +-AC_SEARCH_LIBS(inet_pton, [socket nsl], [ +- dnl check for pre-BIND82 inet_pton() bug. +- AC_MSG_CHECKING(for broken inet_pton) +- AC_TRY_RUN([#include <sys/types.h> +-#include <sys/socket.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +-int main() +-{ +-#ifdef AF_INET6 +- char buf[16]; +- /* this should return 0 (error) */ +- return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf); +-#else +- return 1; +-#endif +-}], [AC_MSG_RESULT(ok); +-have_inet_pton=yes], [AC_MSG_RESULT(broken); +-have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); +-have_inet_pton=no])], +-have_inet_pton=no) +-if test "$have_inet_pton" = no; then +- INET_PTON_C="inet_pton.c" +- INET_PTON_O="inet_pton.o" +- INET_PTON_LO="inet_pton.lo" +-else +- INET_PTON_C="" +- INET_PTON_O="" +- INET_PTON_LO="" +-fi + AC_SUBST(INET_PTON_C) + AC_SUBST(INET_PTON_O) + AC_SUBST(INET_PTON_LO) + +-AC_SEARCH_LIBS(inet_ntop, [socket nsl], [ +- AC_MSG_CHECKING([for inet_ntop prototype]) +- AC_TRY_COMPILE([#include <stdio.h> +-#include <sys/types.h> +-#include <sys/socket.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +- +-extern const char *inet_ntop(int, const void *, char *, size_t);],, [ +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, +- [Define if inet_ntop() prototype exists])], [ +- AC_TRY_COMPILE([#include <stdio.h> +-#include <sys/types.h> +-#include <sys/socket.h> +-#include <netinet/in.h> +-#include <arpa/inet.h> +- +-extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [ +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_INET_NTOP_PROTO, 1, +- [Define if inet_ntop() prototype exists])], [ +- AC_MSG_RESULT(no)])]) +- INET_NTOP_O="" +- INET_NTOP_LO=""], [ +- INET_NTOP_C="inet_ntop.c" +- INET_NTOP_O="inet_ntop.o" +- INET_NTOP_LO="inet_ntop.lo" +- AC_DEFINE(NEED_INET_V6DEFS_H, 1, +- [Define if inet/v6defs.h needs to be included])]) + AC_SUBST(INET_NTOP_C) + AC_SUBST(INET_NTOP_O) + AC_SUBST(INET_NTOP_LO) diff --git a/patches/wireshark-1.2.5/remove-prefix-from-include-path.diff b/patches/wireshark-1.2.5/remove-prefix-from-include-path.diff new file mode 100644 index 000000000..193ace4e9 --- /dev/null +++ b/patches/wireshark-1.2.5/remove-prefix-from-include-path.diff @@ -0,0 +1,48 @@ +Subject: remove prefix from search paths +From: Michael Olbrich <m.olbrich@pengutronix.de> + +configure adds prefix/include and prefix/lib to the search paths. +This breaks cross-compiling with DESTDIR +This patch removes this broken stuff. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + configure.in | 24 ------------------------ + 1 file changed, 24 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -445,30 +445,6 @@ darwin*) + esac + AC_SUBST(FRAMEWORKS) + +-# +-# If using $prefix we add "$prefix/include" to the include search path +-# and "$prefix/lib" to the library search path. +-# +-if test "x$prefix" != "x" ; then +- AC_MSG_CHECKING(whether to use $prefix for headers and libraries) +- if test -d $prefix/include ; then +- AC_MSG_RESULT(yes) +- # +- # Arrange that we search for header files in "$prefix/include", as +- # various packages we use may have been installed under "$prefix/include". +- # +- CFLAGS="$CFLAGS -I$prefix/include" +- CPPFLAGS="$CPPFLAGS -I$prefix/include" +- +- # +- # Arrange that we search for libraries in "$prefix/lib". +- # +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib) +- else +- AC_MSG_RESULT(no) +- fi +-fi +- + dnl Look in /usr/local for header files and libraries ? + dnl XXX FIXME don't include /usr/local if it is already in the system + dnl search path as this causes gcc 3.2 on Linux to complain about a change diff --git a/patches/wireshark-1.2.5/series b/patches/wireshark-1.2.5/series new file mode 100644 index 000000000..073301c42 --- /dev/null +++ b/patches/wireshark-1.2.5/series @@ -0,0 +1,2 @@ +remove-prefix-from-include-path.diff +hack-crosscompiling.diff diff --git a/rules/wireshark.in b/rules/wireshark.in index 98be28df6..ab8ba69a3 100644 --- a/rules/wireshark.in +++ b/rules/wireshark.in @@ -1,9 +1,6 @@ ## SECTION=networking menuconfig WIRESHARK tristate - depends on BROKEN - # incorrectly runs libgnutls-config from the host while trying - # to find out where tls is prompt "wireshark " select LIBPCAP select GLIB diff --git a/rules/wireshark.make b/rules/wireshark.make index c665fc20a..7b3849188 100644 --- a/rules/wireshark.make +++ b/rules/wireshark.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: template 6001 2006-08-12 10:15:00Z mkl $ # # Copyright (C) 2006 by Juergen Beisert +# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_WIRESHARK) += wireshark # # Paths and names # -WIRESHARK_VERSION := 0.99.3a +WIRESHARK_VERSION := 1.2.5 WIRESHARK := wireshark-$(WIRESHARK_VERSION) WIRESHARK_SUFFIX := tar.gz WIRESHARK_URL := http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX) @@ -28,35 +28,14 @@ WIRESHARK_DIR := $(BUILDDIR)/$(WIRESHARK) # Get # ---------------------------------------------------------------------------- -wireshark_get: $(STATEDIR)/wireshark.get - -$(STATEDIR)/wireshark.get: $(wireshark_get_deps_default) - @$(call targetinfo, $@) - @$(call touch, $@) - $(WIRESHARK_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, WIRESHARK) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -wireshark_extract: $(STATEDIR)/wireshark.extract - -$(STATEDIR)/wireshark.extract: $(wireshark_extract_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(WIRESHARK_DIR)) - @$(call extract, WIRESHARK) - @$(call patchin, WIRESHARK) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -wireshark_prepare: $(STATEDIR)/wireshark.prepare - WIRESHARK_PATH := PATH=$(CROSS_PATH) WIRESHARK_ENV := $(CROSS_ENV) @@ -68,15 +47,14 @@ WIRESHARK_AUTOCONF = $(CROSS_AUTOCONF_USR) \ --disable-usr-local \ --disable-threads \ --disable-profile-build \ - --disable-gtktest \ --disable-glibtest \ --disable-editcap \ --disable-mergecap \ --disable-text2pcap \ - --disable-idl2eth \ --disable-dftest \ --disable-randpkt \ - --with-pcap=$(LIBPCAP_DIR) + --with-pcap=$(LIBPCAP_DIR) \ + --without-gcrypt ifdef PTXCONF_WIRESHARK_TSHARK WIRESHARK_AUTOCONF += --enable-tshark @@ -96,77 +74,41 @@ else WIRESHARK_AUTOCONF += --disable-ipv6 endif -$(STATEDIR)/wireshark.prepare: $(wireshark_prepare_deps_default) - @$(call targetinfo, $@) - @$(call clean, $(WIRESHARK_DIR)/config.cache) - cd $(WIRESHARK_DIR) && \ - $(WIRESHARK_PATH) $(WIRESHARK_ENV) \ - ./configure $(WIRESHARK_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -wireshark_compile: $(STATEDIR)/wireshark.compile - -$(STATEDIR)/wireshark.compile: $(wireshark_compile_deps_default) - @$(call targetinfo, $@) - cd $(WIRESHARK_DIR) && $(WIRESHARK_PATH) $(MAKE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -wireshark_install: $(STATEDIR)/wireshark.install - -$(STATEDIR)/wireshark.install: $(wireshark_install_deps_default) - @$(call targetinfo, $@) - @$(call install, WIRESHARK) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -wireshark_targetinstall: $(STATEDIR)/wireshark.targetinstall - -$(STATEDIR)/wireshark.targetinstall: $(wireshark_targetinstall_deps_default) - @$(call targetinfo, $@) +$(STATEDIR)/wireshark.targetinstall: + @$(call targetinfo) @$(call install_init, wireshark) @$(call install_fixup,wireshark,PACKAGE,wireshark) @$(call install_fixup,wireshark,PRIORITY,optional) @$(call install_fixup,wireshark,VERSION,$(WIRESHARK_VERSION)) @$(call install_fixup,wireshark,SECTION,base) - @$(call install_fixup,wireshark,AUTHOR,"Juergen Beisert <j.bisert\@pengutronix.de>") + @$(call install_fixup,wireshark,AUTHOR,"Juergen Beisert <j.bisert@pengutronix.de>") @$(call install_fixup,wireshark,DEPENDS,) @$(call install_fixup,wireshark,DESCRIPTION,missing) # # executables # - @$(call install_copy, wireshark, 0, 0, 0755, \ - $(WIRESHARK_DIR)/.libs/capinfos, /usr/bin/capinfos) - @$(call install_copy, wireshark, 0, 0, 0755, \ - $(WIRESHARK_DIR)/.libs/dumpcap, /usr/bin/dumpcap) - @$(call install_copy, wireshark, 0, 0, 0755, \ - $(WIRESHARK_DIR)/.libs/lt-tshark, /usr/bin/lt-tshark) - @$(call install_copy, wireshark, 0, 0, 0755, \ - $(WIRESHARK_DIR)/.libs/tshark, /usr/bin/tshark) + @$(call install_copy, wireshark, 0, 0, 0755, -, \ + /usr/bin/capinfos) + @$(call install_copy, wireshark, 0, 0, 0755, -, \ + /usr/bin/dumpcap) + @$(call install_copy, wireshark, 0, 0, 0755, -, \ + /usr/bin/tshark) # # libraries used by some of the executables # - @$(call install_copy, wireshark, 0, 0, 0644, \ - $(WIRESHARK_DIR)/wiretap/.libs/libwiretap.so.0.0.1, \ + @$(call install_copy, wireshark, 0, 0, 0644, -, \ /usr/lib/libwiretap.so.0.0.1) @$(call install_link, wireshark, libwiretap.so.0.0.1, \ /usr/lib/libwiretap.so.0) @$(call install_link, wireshark, libwiretap.so.0.0.1, \ /usr/lib/libwiretap.so) - @$(call install_copy, wireshark, 0, 0, 0644, \ - $(WIRESHARK_DIR)/epan/.libs/libwireshark.so.0.0.1, \ + @$(call install_copy, wireshark, 0, 0, 0644, -, \ /usr/lib/libwireshark.so.0.0.1) @$(call install_link, wireshark, libwireshark.so.0.0.1, \ /usr/lib/libwireshark.so.0) @@ -175,7 +117,7 @@ $(STATEDIR)/wireshark.targetinstall: $(wireshark_targetinstall_deps_default) @$(call install_finish,wireshark) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |