summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2015-11-182.0.0 → 2.0.1.Gerald Combs1-1/+1
Change-Id: I29a71f3bc76eb1fdc226c9f340c45fb3bcf7dffc Reviewed-on: https://code.wireshark.org/review/11955 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-10Apple calls it just "OS X" these days.Guy Harris1-2/+2
Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4 Reviewed-on: https://code.wireshark.org/review/11703 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 0b05086754ad977d639ed7715a34b57b5e0ee28e) Reviewed-on: https://code.wireshark.org/review/11704
2015-10-25Require GnuTLS 2.12.0, add cmake version detectionPeter Wu1-2/+2
Since v2.1.0rc0-17-g877fd03 and v2.0.0rc0-23-g263ff53 ("ssl-utils: load RSA keys based on their modulus+exponent"), GnuTLS 2.12.0 is needed. Add a version check to cmake as well, tested on CentOS6 (with pkg-config check disabled to verify the code path). Note that RHEL6 has GnuTLS 2.8.5 and thus SSL decryption with a RSA private key is no longer supported on that version. Change-Id: I99fdfe6790107f48629dd435794fe8880263063d Reviewed-on: https://code.wireshark.org/review/11044 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> (cherry picked from commit fe1ab42f160ac9b67f181775321fa89b62102159) Reviewed-on: https://code.wireshark.org/review/11262
2015-10-20Require libgcrypt 1.4.2, add cmake version detectionPeter Wu1-3/+3
libgcrypt 1.4.2 is required since since v1.11.0-rc1-2787-g23f9100 ("Really add support for AEAD ciphers (GCM)") due to the use of gcry_cipher_setctr. Bump the version in configure.ac too. Add version check for gcrypt to cmake. Tested with CentOS 6 (cmake 2.8.12.2, libgcrypt 1.4.5). Change-Id: I93c3ed902a764d9d14675779e866230d073c96d5 Reviewed-on: https://code.wireshark.org/review/11043 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit 82ec0bb0fc6bf551693d26c8a575bb3fbd9d0264) Reviewed-on: https://code.wireshark.org/review/11167
2015-10-16Make it possible to not build the Qt RPM (again).Jeff Morriss1-1/+1
The spec file will build with Qt5 unless told not to; ./configure has to tell it not to (if the user doesn't have/want Qt). Change-Id: Ib75462d20c841e75e425b5b07117f10e5573ad58 Reviewed-on: https://code.wireshark.org/review/11061 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit e446d49be8277dbf7cd8fd3d6567683c7a85a989) Reviewed-on: https://code.wireshark.org/review/11075
2015-10-13Update the Qt welcome banner.Gerald Combs1-1/+1
Empty the "flavor" banner text by default to allow room for custom builds. Make the main welcome message more prominent. Change-Id: I92d2ed88abbe504af8a0818f9902e39a9fc3d6d5 Reviewed-on: https://code.wireshark.org/review/10969 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-09Now that we're using AC_PROG_CC_STDC, let it handle HP C.Guy Harris1-8/+9
AC_PROG_CC_STDC should be setting whatever flags are needed for ISO C plus extensions, including requesting C99 if available. Don't set -Ae ourselves for HP C. Change-Id: Icd4dfc0c2078586d5773075ee25c40bfc787a482 Reviewed-on: https://code.wireshark.org/review/10910 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 12446da29bf57dc95b9050cc0ec669d60a381dc0) Reviewed-on: https://code.wireshark.org/review/10911
2015-10-08The second argument to AC_PATH_PROGS is a list of program names.Guy Harris1-1/+1
The *third* argument is the value to use if we don't find the program; we shouldn't fall back on "python3" if we can't find "python", we should try both "python" and "python3" and just set $PYTHON to nothing if we don't find either one. Change-Id: I5168455f09bc3165c49db4334f05856dec46bf62 Reviewed-on: https://code.wireshark.org/review/10890 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2bd7c48b44af5ebedefdb4c98d1b8cb708463881) Reviewed-on: https://code.wireshark.org/review/10891
2015-10-07Don't just ask for C, ask for standard C - preferably C99.Guy Harris1-1/+5
We're using some C99 features, such as variadic macros, so if there's a compiler flag needed for C99 features, make sure it's supplied. If the compiler doesn't support standard C, complain. Change-Id: I6fb18f5222567249370b3d43065f2258dbde7e4d Reviewed-on: https://code.wireshark.org/review/10866 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 8b030b61a931892ff46eae438f6b9f3b7119115e) Reviewed-on: https://code.wireshark.org/review/10867
2015-10-05Initialize master-2.0.Gerald Combs1-5/+5
There is a checklist for all of this. It is sizeable. Change-Id: Ib538ac32a2764753a3f339c8466cac077c470166 Signed-off-by: Gerald Combs <gerald@wireshark.org> Reviewed-on: https://code.wireshark.org/review/10808
2015-10-05Allow use of variadic macrosPeter Wu1-0/+1
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-02Qt: Initial RTP playback.Gerald Combs1-4/+11
Note the "initial". This is woefully incomplete. See the "to do" lists below and in the code. This differs a bit from the GTK+ version in that you specify one or more streams to be decoded. Instead of showing waveforms in individual widgets, add them all to a single QCustomPlot. This conserves screen real estate and lets us more easily take advantage of the QCP API. It also looks better IMHO. Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We probably won't use the widgets until we make 5.0 our minimum Qt version and plain old QtMultimedia lets us support Qt 4 more easily (in theory at least). Add resampling code from libspeex. I initially used this to resample each packet to match the preferred rate of our output device, but this resulted in poorer audio quality than expected. Leave it in and use to create visual samples for QCP and to match rates any time the rate changes. The latter is currently untested. Add some debugging macros. Note that both the RTP player and RTP analysis dialogs decode audio data using different code. Note that voip_calls_packet and voip_calls_init_tap appear to be dead code. To do: - Add silence frames where needed. - Implement the jitter buffer. - Implement the playback timing controls. - Tapping / scanning streams might be too slow. Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 Bug: 9007 Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-01Set the minimum Qt version to 4.7.Gerald Combs1-1/+1
We've been using QElapsedTimer for a while now with no complaints. It was introduced in Qt 4.7, which was first released in September 2010. Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4 Reviewed-on: https://code.wireshark.org/review/10732 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-16Don't force Lua support in RPMs (some distros don't ship a compatible LuaJeff Morriss1-1/+10
anymore). Also make the RPM follow configure's qt4-vs-qt5 choice. Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9 Reviewed-on: https://code.wireshark.org/review/10532 Reviewed-by: Jeffrey Smith <whydoubt@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-09-021.99.9 → 1.99.10.Gerald Combs1-1/+1
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-241.99.8 → 1.99.9.Gerald Combs1-1/+1
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-13On OS X, add an rpath for the Qt frameworks, and remove it in the app bundle.Guy Harris1-1/+21
Qt 5.5 and later have @rpath-based install names for the frameworks, which means that, if they're not installed in some frameworks directory searched by default (such as /Library/Frameworks) - which is the default case with the Qt installer - they won't be found by default. Add the directory in which the frameworks exist as an rpath in the Wireshark binary, so that they'll be found, and then remove it from the Wireshark binary in the app bundle, as the directory in which the frameworks exist on the machine on which Wireshark was built is irrelevant to the machines on which it's being deployed - the frameworks are included in the bundle, and we already add an rpath to find them there. Change-Id: I54e033743e7b17eab26976064dcd7cd000f97c78 Reviewed-on: https://code.wireshark.org/review/9625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13Make OS X .app bundling work with Qt 5.5.Guy Harris1-10/+2
macdeployqt doesn't actually seem to deploy any of Qt into the app bundle, probably because we're using it in a fashion they didn't intend (i.e., not doing everything with *their* build tools), so we just extend our dependency-binding stuff to handle the Qt libraries, and copy over the Qt plugins ourselves. We also add the rpaths to the executables and libraries as part of the app bundle building process; I thought it'd fix macdeployqt's problem, but it didn't, however, it's probably cleaner to do it there anyway. Change-Id: I134c2b1a32e168e82de67f0b674d17167481d69a Reviewed-on: https://code.wireshark.org/review/9612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-12Update a comment.Guy Harris1-1/+2
Change-Id: I38e42ec1ea86a0678333093795be707d6e68ab62 Reviewed-on: https://code.wireshark.org/review/9607 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-10Update library release dates.Gerald Combs1-2/+8
Change-Id: I053096551a18242062766d966a2f28da047d5761 Reviewed-on: https://code.wireshark.org/review/9592 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-10Make .o files, not .cpp and .h files, depend on the ui_*.h files.Guy Harris1-27/+16
That's one of the mechanisms the autotools documentation suggests using to handle generated header files. Using it means that "make dist" will no longer try to build those files (they're not part of the distribution - and they can't be, as the files would be different for Qt 4 and Qt 5, and need to be generated by the uic from the same version of Qt as the one against which Wireshark is being built). This means we don't need to try to find uic, moc, or rcc if we're not building with Qt, so don't do so. Change-Id: Id2aadb8289598b82e14e4ed402ff8cdc15fdef74 Reviewed-on: https://code.wireshark.org/review/9583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-09Clean up the "Build wireshark" message.Guy Harris1-1/+2
Change-Id: I40883aee5207dd8a437fcde827386bd370fbe96c Reviewed-on: https://code.wireshark.org/review/9570 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08Make sure we get the Qt tools for the Qt version with which we're building.Guy Harris1-67/+26
For example, Qt 4's uic produces .h files that don't compile with Qt 5, as they use header #include paths that work with Qt 4's headers but not Qt 5's headers. Change-Id: I50c7bd15fca05475180a933a6c77955dc686c0c5 Reviewed-on: https://code.wireshark.org/review/9567 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-181.99.7 → 1.99.8Gerald Combs1-1/+1
Change-Id: I3423fd2959b1031480f15504ce38336ce3475b17 Reviewed-on: https://code.wireshark.org/review/8979 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Disable AirPcap by default in Autotools.Gerald Combs1-2/+4
Note that we might want to remove the check entirely. Change-Id: Ie0003abc64cd6f47c4f49770beb5d418995e939a Reviewed-on: https://code.wireshark.org/review/8950 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-09Clean up --with-qt handling.Guy Harris1-6/+13
If you don't specify --with-qt or --without-qt, we build with Qt iff we find it; we don't fail if we don't find it. If you specify --with-qt, we build with Qt if we find it and fail if we don't find it. If you specify --without-qt, we don't look for Qt and don't build with it. This is all independent of --with-gtk2 or --with-gtk3. Change-Id: I508d3281192bda9168fc46aba6011687c83ef818 Reviewed-on: https://code.wireshark.org/review/8861 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-31configure.ac: openSUSE build fixBart Van Assche1-85/+58
For some Linux distro's (e.g. openSUSE) the Qt4 tools have no suffix and the Qt5 tools have the suffix "-qt5". On such systems search for the Qt5 tools first. This avoids that compilation fails with the following error message: In file included from follow_stream_dialog.cpp:23:0: ui_follow_stream_dialog.h: In member function 'void Ui_FollowStreamDialog::retranslateUi(QDialog*)': ui_follow_stream_dialog.h:152:110: error: 'UnicodeUTF8' is not a member of 'QApplication' e(QApplication::translate("FollowStreamDialog", "Follow Stream", 0, QApplicatio ^ Bug: 11233 Change-Id: I09ccdb6a74043b6d952814b74fec5d618e6e26aa Reviewed-on: https://code.wireshark.org/review/8686 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-281.99.6 → 1.99.7.Gerald Combs1-1/+1
Change-Id: I8c431f162d199c8507ba57d84e496dce5f5a0933 Reviewed-on: https://code.wireshark.org/review/8677 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-22allow use of deprecated gdk-pixbuf functionsAndreas Stieger1-1/+0
gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated, including gdk_pixbuf_new_from_inline. Wireshark builds with deprecated functions turned off by default, in this case GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of deprecated function until upstream has ported the code, or a replacement patch is available. Bug: 10750 gdk-pixbuf change: https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9 Initial warning: ui_utils.c: In function 'window_icon_realize_cb': ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Causes these warnings due to the implicit declaration: gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Fails the package checks in these lines: E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512 E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531 E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351 E: wireshark 64bit-portability-issue stock_icons.c:413, 425 Change-Id: I85092753058cd2e5cda527e4321a7d92ac38facd Reviewed-on: https://code.wireshark.org/review/8578 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-05-08Add some more warnings when building with Sun^WOracle's C compiler.Guy Harris1-0/+7
Change-Id: I696b0757ba7fece61f50ebcee79b576a4f15660f Reviewed-on: https://code.wireshark.org/review/8361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06Fix configuration with --without-qt and with no --with-gtk[23].Guy Harris1-1/+10
If building with Wireshark wasn't explicitly disabled - i.e., if we are building Wireshark, which means we are building an application with a GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were explicitly enabled, look for GTK+ 3. Change-Id: Ib913355f7b483d065e766605aa88a71fa9984f36 Reviewed-on: https://code.wireshark.org/review/8306 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-29Fix typo: we already checked for rcc and rcc-qt5, now it's time to check forJeff Morriss1-98/+98
rcc-qt4 (not rcc again). Fix up indentation: consistently use tabs. Change-Id: I8e6d5a601f2a28fef5eb705d8bfac0e02a0e02f3 Reviewed-on: https://code.wireshark.org/review/8233 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-29When configuring with Wireshark disabled, don't complain if uic, moc, and rccJeff Morriss1-3/+3
aren't found. This would work before but only if you explicitly disabled Qt. Bug: 11157 Change-Id: I1e4c2c18277e28c38b1ed2ffcaf45e49926e7a1f Reviewed-on: https://code.wireshark.org/review/8232 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-13Add a major version number argument to --with-qt.Guy Harris1-7/+22
Without a major version number, it behaves as before, picking whatever version it finds, and preferring Qt 5 to Qt 4. With a major version number, it looks only for the version in question. Bug: 10793 Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d Reviewed-on: https://code.wireshark.org/review/8052 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-12Only add flags to CFLAGS_FOR_BUILD if $CC and $CC_FOR_BUILD are the same.Guy Harris1-1/+9
Otherwise, just because a flag is appropriate for $CC, that doesn't necessarily mean it's appropriate for $CFLAGS_FOR_BUILD. (We don't use CFLAGS_FOR_BUILD for many things, so it's probably not worth making a lot of effort to throw all the warning flags into it if we're cross-compiling; we *do* throw them in for native compilation, which is what most developers use and test with, so that should be sufficient to let the warnings catch problems with the build tools we're building.) Change-Id: Iad9d611b4687e9e154f9871f741f3c8f3b307c88 Reviewed-on: https://code.wireshark.org/review/8026 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-08extcap: Add support for Android - androiddumpMichal Labedzki1-0/+33
androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump (<Kitkat) 7. Bluetooth Bluedroid External Parser (Kitkat) 8. Bluetooth BtsnoopNet (Lollipop) Change-Id: I26e4cd1a37a6af805f8b932399b4aa44ee7b5a80 Reviewed-on: https://code.wireshark.org/review/7475 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-30Work around a Linux bonding driver bug (and the lack of a libpcap workaround).Guy Harris1-0/+11
The bonding driver does not properly handle unknown ioctls; it returns ENODEV rather than ENOTSUP, EOPNOTSUPP, ENOTTY, or a "not supported" error of that type. This causes problems detailed in bug 11058. On Linux, check for bonding devices before checking for monitor-mode support. While we're at it, get rid of a commented-out include of CheckCSourceCompiles (it's presumably already been implicitly included by other functions that use it). Bug: 11058 Change-Id: I13035de0650634c51a52f262829b2b6fb86b39e9 Reviewed-on: https://code.wireshark.org/review/7856 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-25Always use html2text.py for FAQ, improve outputPeter Wu1-8/+4
A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-201.99.5 → 1.99.6.Gerald Combs1-1/+1
Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-191.99.4 → 1.99.5.Gerald Combs1-1/+1
Change-Id: Ifa1a57ac2db5d921d9b53dbe997cfa1916720c26 Reviewed-on: https://code.wireshark.org/review/7759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-08Revert "[Qt translations] create the .qm files during the build"Martin Kaiser1-23/+0
This reverts commit 7d01a84d0e2833f685b7e70c3a52097891286566. cmake doesn't get the dependencies right if the .qm files are gone I'll work on this off-line and resubmit it as one commit rather than trying to approach this step-by-step Change-Id: Ibbd60163f910adbd571b3df2a980d64dbf1ea924 Reviewed-on: https://code.wireshark.org/review/7596 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-07[Qt translations] create the .qm files during the buildMartin Kaiser1-0/+23
create the .qm files from the .ts files at compile time for now, this works for autotools only don't fail if Qt's lrelease tool is not available, skip building the .qm files in this case Change-Id: I869a6dc8220eb03e7ffc8bfdb2b6f3930f6cac72 Reviewed-on: https://code.wireshark.org/review/7460 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-051.99.3 → 1.99.4.Gerald Combs1-1/+1
Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-03Look for and use gethostbyname() if we don't have getaddrinfo(). Fail toJeff Morriss1-6/+27
configure if we can't find any name resolver (autotools only). This puts back the gethostbyname()/gethostbyname2() code removed in I3348179626e97daaddfbc89e3ed21e39915e3de4 and If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c but as a last-resort option (only if we don't have a better or more modern name resolver). As suggested/requested by Guy in https://code.wireshark.org/review/#/c/7423/ Change-Id: I706dbbd65135f47c67d3d8d88a61ad7273914c47 Reviewed-on: https://code.wireshark.org/review/7447 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-27wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks.Guy Harris1-1/+1
Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f Reviewed-on: https://code.wireshark.org/review/7432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27We don't use gethostbyname2(), don't check for it.Guy Harris1-1/+1
Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63 Reviewed-on: https://code.wireshark.org/review/7431 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-19Qt: Add more version and packaging information to the main window.Gerald Combs1-0/+2
Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-19Check whether emmintrin.h can be used *without* -msse4.2.Guy Harris1-19/+45
If not, we can't use SSE 4.2, as we need to be able to include it in files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2 instructions to a small bit of code that uses them only if running on hardware that supports them). Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c Reviewed-on: https://code.wireshark.org/review/7246 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Add AddressSanitizer (ASAN) build optionAlexis La Goutte1-0/+18
--enable-asan for autotools -D ENABLE_ASAN:BOOL=TRUE for CMake Need Clang/LLVM >= 3.1 or GCC >= 4.9 More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a Reviewed-on: https://code.wireshark.org/review/1727 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-17Added JSON native file support.Dario Lombardo1-1/+0
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-20 11:32:08 +0000