mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2025-12-22 03:30:17 +00:00
Update repo
This commit is contained in:
34
disabled-packages/wireshark-gtk/build.sh
Normal file
34
disabled-packages/wireshark-gtk/build.sh
Normal file
@@ -0,0 +1,34 @@
|
||||
# x11-packages
|
||||
TERMUX_PKG_HOMEPAGE=https://www.wireshark.org/
|
||||
TERMUX_PKG_DESCRIPTION="Network protocol analyzer"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=2.6.14
|
||||
TERMUX_PKG_REVISION=21
|
||||
TERMUX_PKG_SRCURL=https://www.wireshark.org/download/src/all-versions/wireshark-${TERMUX_PKG_VERSION}.tar.xz
|
||||
TERMUX_PKG_SHA256=c4d133c48f52d81fc334c30fa21e09be484d862c29310e57fc2532e5b572e9c4
|
||||
|
||||
TERMUX_PKG_DEPENDS="atk, c-ares, desktop-file-utils, gdk-pixbuf, glib, gtk3, hicolor-icon-theme, krb5, libandroid-shmem, libcairo, libcap, libgcrypt, libgnutls, libgpg-error, liblua52, liblz4, libmaxminddb, libnghttp2, libnl, libpcap, libssh, libxml2, pango, zlib"
|
||||
TERMUX_PKG_CONFLICTS="tshark, wireshark, wireshark-cli"
|
||||
TERMUX_PKG_PROVIDES="tshark, wireshark, wireshark-cli"
|
||||
TERMUX_PKG_REPLACES="tshark, wireshark, wireshark-cli"
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-gtk=3 --with-qt=no"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
|
||||
termux_step_pre_configure() {
|
||||
export CFLAGS=$(echo $CFLAGS | sed 's@-Oz@-Os@g')
|
||||
export LIBS=" -landroid-shmem"
|
||||
}
|
||||
|
||||
termux_step_post_configure() {
|
||||
## prebuild libwsutil & libwscodecs for target (needed for plugins/codecs/l16_mono)
|
||||
cd ./wsutil && {
|
||||
make
|
||||
cd -
|
||||
}
|
||||
cd ./codecs && {
|
||||
make
|
||||
cd -
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
diff -uNr wireshark-2.6.1/caputils/ws80211_utils.c wireshark-2.6.1.mod/caputils/ws80211_utils.c
|
||||
--- wireshark-2.6.1/caputils/ws80211_utils.c 2018-05-22 21:53:08.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/caputils/ws80211_utils.c 2018-06-26 18:49:28.794971784 +0300
|
||||
@@ -680,7 +680,7 @@
|
||||
|
||||
/* Update names of user created monitor interfaces */
|
||||
while(fgets(line, sizeof(line), fh)) {
|
||||
- t = index(line, ':');
|
||||
+ t = strchr(line, ':');
|
||||
if (!t)
|
||||
continue;
|
||||
*t = 0;
|
||||
@@ -934,7 +934,7 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
-const char *network_manager_path = "/usr/sbin/NetworkManager"; /* Is this correct? */
|
||||
+const char *network_manager_path = "@TERMUX_PREFIX@/bin/NetworkManager"; /* Is this correct? */
|
||||
const char *ws80211_get_helper_path(void) {
|
||||
if (g_file_test(network_manager_path, G_FILE_TEST_IS_EXECUTABLE)) {
|
||||
return network_manager_path;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/configure wireshark-2.6.1.mod/configure
|
||||
--- wireshark-2.6.1/configure 2018-05-22 21:53:32.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/configure 2018-06-26 18:49:28.811638451 +0300
|
||||
@@ -45400,7 +45400,7 @@
|
||||
fi
|
||||
|
||||
|
||||
-LD_OPTION="-Wl,--as-needed"
|
||||
+LD_OPTION=""
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can add $LD_OPTION to LDFLAGS" >&5
|
||||
$as_echo_n "checking whether we can add $LD_OPTION to LDFLAGS... " >&6; }
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/epan/dissectors/packet-gtp.c wireshark-2.6.1.mod/epan/dissectors/packet-gtp.c
|
||||
--- wireshark-2.6.1/epan/dissectors/packet-gtp.c 2018-05-22 21:53:08.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/epan/dissectors/packet-gtp.c 2018-06-26 20:34:32.368621631 +0300
|
||||
@@ -2358,7 +2358,7 @@
|
||||
/* Next definitions and function check_field_presence checks if given field
|
||||
* in GTP packet is compliant with ETSI
|
||||
*/
|
||||
-typedef struct _header {
|
||||
+typedef struct _ext_header {
|
||||
guint8 code;
|
||||
guint8 presence;
|
||||
} ext_header;
|
||||
@@ -0,0 +1,14 @@
|
||||
diff -uNr wireshark-2.6.1/epan/dissectors/packet-snort.c wireshark-2.6.1.mod/epan/dissectors/packet-snort.c
|
||||
--- wireshark-2.6.1/epan/dissectors/packet-snort.c 2018-05-22 21:53:09.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/epan/dissectors/packet-snort.c 2018-06-26 18:49:28.831638452 +0300
|
||||
@@ -115,8 +115,8 @@
|
||||
|
||||
/* Snort binary and config file */
|
||||
#ifndef _WIN32
|
||||
-static const char *pref_snort_binary_filename = "/usr/sbin/snort";
|
||||
-static const char *pref_snort_config_filename = "/etc/snort/snort.conf";
|
||||
+static const char *pref_snort_binary_filename = "@TERMUX_PREFIX@/bin/snort";
|
||||
+static const char *pref_snort_config_filename = "@TERMUX_PREFIX@/etc/snort/snort.conf";
|
||||
#else
|
||||
/* Default locations from Snort Windows installer */
|
||||
static const char *pref_snort_binary_filename = "C:\\Snort\\bin\\snort.exe";
|
||||
@@ -0,0 +1,14 @@
|
||||
diff -uNr wireshark-2.6.1/epan/maxmind_db.c wireshark-2.6.1.mod/epan/maxmind_db.c
|
||||
--- wireshark-2.6.1/epan/maxmind_db.c 2018-05-22 21:53:09.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/epan/maxmind_db.c 2018-06-26 18:49:28.834971786 +0300
|
||||
@@ -69,8 +69,8 @@
|
||||
{ "C:\\ProgramData\\GeoIP" },
|
||||
{ "C:\\GeoIP" },
|
||||
#else
|
||||
- { "/usr/share/GeoIP" },
|
||||
- { "/var/lib/GeoIP" },
|
||||
+ { "@TERMUX_PREFIX@/share/GeoIP" },
|
||||
+ { "@TERMUX_PREFIX@/var/lib/GeoIP" },
|
||||
#endif
|
||||
{ NULL }
|
||||
};
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/epan/oids.c wireshark-2.6.1.mod/epan/oids.c
|
||||
--- wireshark-2.6.1/epan/oids.c 2018-05-22 21:53:09.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/epan/oids.c 2018-06-26 18:49:28.834971786 +0300
|
||||
@@ -1276,7 +1276,7 @@
|
||||
g_string_append_printf(path_str, "%s", path);
|
||||
g_free (path);
|
||||
#else
|
||||
- g_string_append(path_str, "/usr/share/snmp/mibs");
|
||||
+ g_string_append(path_str, "@TERMUX_PREFIX@/share/snmp/mibs");
|
||||
if (!smi_init_done)
|
||||
smiInit(NULL);
|
||||
path = smiGetPath();
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/codecs/l16_mono/Makefile.in wireshark-2.6.1.mod/plugins/codecs/l16_mono/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/codecs/l16_mono/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/codecs/l16_mono/Makefile.in 2018-06-26 21:21:28.648763042 +0300
|
||||
@@ -830,7 +830,7 @@
|
||||
}
|
||||
|
||||
l16mono.la: $(l16mono_la_OBJECTS) $(l16mono_la_DEPENDENCIES) $(EXTRA_l16mono_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(codecs_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(l16mono_la_LINK) -rpath $(codecs_plugindir) $(l16mono_la_OBJECTS) $(l16mono_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -L$(top_srcdir)/codecs/.libs -lwscodecs $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/ethercat/Makefile.in wireshark-2.6.1.mod/plugins/epan/ethercat/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/ethercat/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/ethercat/Makefile.in 2018-06-26 18:52:57.078315575 +0300
|
||||
@@ -866,7 +866,7 @@
|
||||
}
|
||||
|
||||
ethercat.la: $(ethercat_la_OBJECTS) $(ethercat_la_DEPENDENCIES) $(EXTRA_ethercat_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(ethercat_la_LINK) -rpath $(epan_plugindir) $(ethercat_la_OBJECTS) $(ethercat_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(ethercat_la_LINK) -rpath $(epan_plugindir) $(ethercat_la_OBJECTS) $(ethercat_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lwsutil -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/gryphon/Makefile.in wireshark-2.6.1.mod/plugins/epan/gryphon/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/gryphon/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/gryphon/Makefile.in 2018-06-26 19:39:49.668456801 +0300
|
||||
@@ -851,7 +851,7 @@
|
||||
}
|
||||
|
||||
gryphon.la: $(gryphon_la_OBJECTS) $(gryphon_la_DEPENDENCIES) $(EXTRA_gryphon_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(gryphon_la_LINK) -rpath $(epan_plugindir) $(gryphon_la_OBJECTS) $(gryphon_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(gryphon_la_LINK) -rpath $(epan_plugindir) $(gryphon_la_OBJECTS) $(gryphon_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/irda/Makefile.in wireshark-2.6.1.mod/plugins/epan/irda/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/irda/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/irda/Makefile.in 2018-06-26 18:53:17.444983265 +0300
|
||||
@@ -859,7 +859,7 @@
|
||||
}
|
||||
|
||||
irda.la: $(irda_la_OBJECTS) $(irda_la_DEPENDENCIES) $(EXTRA_irda_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(irda_la_LINK) -rpath $(epan_plugindir) $(irda_la_OBJECTS) $(irda_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(irda_la_LINK) -rpath $(epan_plugindir) $(irda_la_OBJECTS) $(irda_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/mate/Makefile.in wireshark-2.6.1.mod/plugins/epan/mate/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/mate/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/mate/Makefile.in 2018-06-26 18:52:25.204980641 +0300
|
||||
@@ -914,7 +914,7 @@
|
||||
}
|
||||
|
||||
mate.la: $(mate_la_OBJECTS) $(mate_la_DEPENDENCIES) $(EXTRA_mate_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(mate_la_LINK) -rpath $(epan_plugindir) $(mate_la_OBJECTS) $(mate_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(mate_la_LINK) -rpath $(epan_plugindir) $(mate_la_OBJECTS) $(mate_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lwsutil -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/opcua/Makefile.in wireshark-2.6.1.mod/plugins/epan/opcua/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/opcua/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/opcua/Makefile.in 2018-06-26 18:52:00.278312724 +0300
|
||||
@@ -884,7 +884,7 @@
|
||||
}
|
||||
|
||||
opcua.la: $(opcua_la_OBJECTS) $(opcua_la_DEPENDENCIES) $(EXTRA_opcua_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(opcua_la_LINK) -rpath $(epan_plugindir) $(opcua_la_OBJECTS) $(opcua_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(opcua_la_LINK) -rpath $(epan_plugindir) $(opcua_la_OBJECTS) $(opcua_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/profinet/Makefile.in wireshark-2.6.1.mod/plugins/epan/profinet/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/profinet/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/profinet/Makefile.in 2018-06-26 18:52:49.191648512 +0300
|
||||
@@ -866,7 +866,7 @@
|
||||
}
|
||||
|
||||
profinet.la: $(profinet_la_OBJECTS) $(profinet_la_DEPENDENCIES) $(EXTRA_profinet_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(profinet_la_LINK) -rpath $(epan_plugindir) $(profinet_la_OBJECTS) $(profinet_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(profinet_la_LINK) -rpath $(epan_plugindir) $(profinet_la_OBJECTS) $(profinet_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwsutil -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/stats_tree/Makefile.in wireshark-2.6.1.mod/plugins/epan/stats_tree/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/stats_tree/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/stats_tree/Makefile.in 2018-06-26 18:53:04.038315925 +0300
|
||||
@@ -836,7 +836,7 @@
|
||||
}
|
||||
|
||||
stats_tree.la: $(stats_tree_la_OBJECTS) $(stats_tree_la_DEPENDENCIES) $(EXTRA_stats_tree_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(stats_tree_la_LINK) -rpath $(epan_plugindir) $(stats_tree_la_OBJECTS) $(stats_tree_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(stats_tree_la_LINK) -rpath $(epan_plugindir) $(stats_tree_la_OBJECTS) $(stats_tree_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/transum/Makefile.in wireshark-2.6.1.mod/plugins/epan/transum/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/transum/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/transum/Makefile.in 2018-06-26 18:53:10.468316247 +0300
|
||||
@@ -857,7 +857,7 @@
|
||||
}
|
||||
|
||||
transum.la: $(transum_la_OBJECTS) $(transum_la_DEPENDENCIES) $(EXTRA_transum_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(transum_la_LINK) -rpath $(epan_plugindir) $(transum_la_OBJECTS) $(transum_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(transum_la_LINK) -rpath $(epan_plugindir) $(transum_la_OBJECTS) $(transum_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lwsutil -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/unistim/Makefile.in wireshark-2.6.1.mod/plugins/epan/unistim/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/unistim/Makefile.in 2018-05-22 21:53:29.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/unistim/Makefile.in 2018-06-26 18:52:10.101646550 +0300
|
||||
@@ -861,7 +861,7 @@
|
||||
}
|
||||
|
||||
unistim.la: $(unistim_la_OBJECTS) $(unistim_la_DEPENDENCIES) $(EXTRA_unistim_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(unistim_la_LINK) -rpath $(epan_plugindir) $(unistim_la_OBJECTS) $(unistim_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(unistim_la_LINK) -rpath $(epan_plugindir) $(unistim_la_OBJECTS) $(unistim_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/wimax/Makefile.in wireshark-2.6.1.mod/plugins/epan/wimax/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/wimax/Makefile.in 2018-05-22 21:53:30.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/wimax/Makefile.in 2018-06-26 19:41:20.178461345 +0300
|
||||
@@ -925,7 +925,7 @@
|
||||
}
|
||||
|
||||
wimax.la: $(wimax_la_OBJECTS) $(wimax_la_DEPENDENCIES) $(EXTRA_wimax_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(wimax_la_LINK) -rpath $(epan_plugindir) $(wimax_la_OBJECTS) $(wimax_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(wimax_la_LINK) -rpath $(epan_plugindir) $(wimax_la_OBJECTS) $(wimax_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/wimaxasncp/Makefile.in wireshark-2.6.1.mod/plugins/epan/wimaxasncp/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/wimaxasncp/Makefile.in 2018-05-22 21:53:30.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/wimaxasncp/Makefile.in 2018-06-26 18:52:17.958313611 +0300
|
||||
@@ -883,7 +883,7 @@
|
||||
}
|
||||
|
||||
wimaxasncp.la: $(wimaxasncp_la_OBJECTS) $(wimaxasncp_la_DEPENDENCIES) $(EXTRA_wimaxasncp_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(wimaxasncp_la_LINK) -rpath $(epan_plugindir) $(wimaxasncp_la_OBJECTS) $(wimaxasncp_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(wimaxasncp_la_LINK) -rpath $(epan_plugindir) $(wimaxasncp_la_OBJECTS) $(wimaxasncp_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark -lwsutil -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/epan/wimaxmacphy/Makefile.in wireshark-2.6.1.mod/plugins/epan/wimaxmacphy/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/epan/wimaxmacphy/Makefile.in 2018-05-22 21:53:30.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/epan/wimaxmacphy/Makefile.in 2018-06-26 19:40:56.385126817 +0300
|
||||
@@ -852,7 +852,7 @@
|
||||
}
|
||||
|
||||
wimaxmacphy.la: $(wimaxmacphy_la_OBJECTS) $(wimaxmacphy_la_DEPENDENCIES) $(EXTRA_wimaxmacphy_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(wimaxmacphy_la_LINK) -rpath $(epan_plugindir) $(wimaxmacphy_la_OBJECTS) $(wimaxmacphy_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(wimaxmacphy_la_LINK) -rpath $(epan_plugindir) $(wimaxmacphy_la_OBJECTS) $(wimaxmacphy_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwireshark $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/plugins/wiretap/usbdump/Makefile.in wireshark-2.6.1.mod/plugins/wiretap/usbdump/Makefile.in
|
||||
--- wireshark-2.6.1/plugins/wiretap/usbdump/Makefile.in 2018-05-22 21:53:30.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/plugins/wiretap/usbdump/Makefile.in 2018-06-26 19:43:25.458467636 +0300
|
||||
@@ -830,7 +830,7 @@
|
||||
}
|
||||
|
||||
usbdump.la: $(usbdump_la_OBJECTS) $(usbdump_la_DEPENDENCIES) $(EXTRA_usbdump_la_DEPENDENCIES)
|
||||
- $(AM_V_CCLD)$(usbdump_la_LINK) -rpath $(wiretap_plugindir) $(usbdump_la_OBJECTS) $(usbdump_la_LIBADD) $(LIBS)
|
||||
+ $(AM_V_CCLD)$(usbdump_la_LINK) -rpath $(wiretap_plugindir) $(usbdump_la_OBJECTS) $(usbdump_la_LIBADD) -L$(top_srcdir)/epan/.libs -L$(top_srcdir)/wsutil/.libs -L$(top_srcdir)/wiretap/.libs -lwiretap -lglib-2.0 $(LIBS)
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/tools/lemon/lemon.c wireshark-2.6.1.mod/tools/lemon/lemon.c
|
||||
--- wireshark-2.6.1/tools/lemon/lemon.c 2018-05-22 21:53:09.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/tools/lemon/lemon.c 2018-06-26 18:49:28.878305121 +0300
|
||||
@@ -3415,7 +3415,7 @@
|
||||
*cp = c;
|
||||
}else{
|
||||
pathlist = getenv("PATH");
|
||||
- if( pathlist==0 ) pathlist = ".:/bin:/usr/bin";
|
||||
+ if( pathlist==0 ) pathlist = ".:@TERMUX_PREFIX@/bin:@TERMUX_PREFIX@/bin/applets";
|
||||
pathbuf = (char *) malloc( lemonStrlen(pathlist) + 1 );
|
||||
if( pathbuf == 0 )
|
||||
return NULL;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr wireshark-2.6.1/wsutil/filesystem.c wireshark-2.6.1.mod/wsutil/filesystem.c
|
||||
--- wireshark-2.6.1/wsutil/filesystem.c 2018-05-22 21:53:09.000000000 +0300
|
||||
+++ wireshark-2.6.1.mod/wsutil/filesystem.c 2018-06-26 18:49:28.898305122 +0300
|
||||
@@ -1184,7 +1184,7 @@
|
||||
#ifdef _WIN32
|
||||
return get_datafile_dir();
|
||||
#else
|
||||
- return "/etc";
|
||||
+ return "@TERMUX_PREFIX@/etc";
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user