diff options
Diffstat (limited to 'net-analyzer/wireshark/files')
5 files changed, 0 insertions, 126 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch deleted file mode 100644 index 24b5c7ddc9bc..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/epan/Makefile.am -+++ b/epan/Makefile.am -@@ -137,6 +137,7 @@ - # Add the object files for missing routines, if any. - # - libwireshark_la_LIBADD = \ -+ ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \ - libwireshark_generated.la \ - libwireshark_asmopt.la crypt/libairpdcap.la \ - ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ -@@ -144,8 +145,7 @@ - wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \ - @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \ - @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \ -- ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \ -- ${top_builddir}/wsutil/libwsutil.la -lm -+ @GLIB_LIBS@ -lm - - libwireshark_la_DEPENDENCIES = \ - libwireshark_generated.la \ diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch deleted file mode 100644 index 94554fdf485c..000000000000 --- a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -61,9 +61,9 @@ - # "-R" here. - # - AC_DEFUN([AC_WIRESHARK_ADD_DASH_L], --[$1="$$1 -L$2" --case "$host_os" in -+[case "$host_os" in - solaris*) -+ $1="$$1 -L$2" - $1="$$1 -R$2" - ;; - esac diff --git a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch deleted file mode 100644 index 639e2993ff6d..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -549,6 +549,7 @@ - wiretap/libwiretap.la \ - wsutil/libwsutil.la \ - @GLIB_LIBS@ \ -+ @PCAP_LIBS@ \ - @SOCKET_LIBS@ - - androiddump_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch deleted file mode 100644 index 1f80be9f4fa9..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1101,6 +1101,7 @@ - AC_SUBST(PIE_CFLAGS) - AC_SUBST(PIE_LDFLAGS) - -+AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ - WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS" - AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) - if test "x$can_add_to_cflags" = "xyes" -@@ -1132,6 +1133,9 @@ - ac_sse4_2_flag=-xarch=sse4_2 - fi - fi -+],[ -+AC_MSG_RESULT(no) -+]) - - # - # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again! diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch deleted file mode 100644 index 51f3c8f9eb9b..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -242,7 +242,7 @@ - # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros - # like PKG_CHECK_MODULES. If the first call to such a macro is under an - # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see --# the comments in acolocal.m4 -+# the comments in aclocal.m4 - # - # We want version 0.7 or better. (XXX - explain why. Is that just - # because our Qt tests were originally based on AM_PATH_GTK, and *it* -@@ -1910,6 +1910,19 @@ - AC_SUBST(plugins_dir) - - # -+# Find out where to store wireshark.pc and what should be in it -+# -+ -+PKG_INSTALLDIR -+ -+AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix]) -+AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`]) -+PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir" -+AC_SUBST(PLUGIN_INSTALL_DIR) -+PROJECT_VERSION="$PACKAGE_VERSION" -+AC_SUBST(PROJECT_VERSION) -+ -+# - # If we have <dlfcn.h>, check whether we have dladdr. - # - if test "$ac_cv_header_dlfcn_h" = "yes" -@@ -3080,10 +3093,15 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - -+# -+# Configuration output -+# -+ - AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg -+ wireshark.pc - asn1/Makefile - _CUSTOM_ASN1_AC_OUTPUT_ - asn1/acp133/Makefile ---- a/Makefile.am -+++ b/Makefile.am -@@ -56,6 +56,12 @@ - smi_modules ipmap.html pdml2html.xsl - - # -+# Install a pkgconfig file -+# -+ -+pkgconfig_DATA = wireshark.pc -+ -+# - # Install global profiles in the "profiles" subdirectory - # - profilesdir = $(pkgdatadir) |