Commit Graph

1152 Commits

Author SHA1 Message Date
Jeff Morriss 8f819bb5bf Also build the source RPM. Clean up after ourselves when done.
svn path=/trunk/; revision=47574
2013-02-08 19:14:37 +00:00
Alexis La Goutte 14780d9a0d Add new images to Makefile.am (needed when use make dist-*)
svn path=/trunk/; revision=47562
2013-02-08 10:14:09 +00:00
Jeff Morriss 3ae58ce943 Put all the aclocal-fallback files in the source distribution.
svn path=/trunk/; revision=47554
2013-02-08 02:53:53 +00:00
Jeff Morriss de92a29c0c Move move of the Qt checks into AM_PATH_QT.
svn path=/trunk/; revision=47553
2013-02-08 02:51:14 +00:00
Jeff Morriss 74cd935845 There is no longer any need to link wireshark.desktop and wireshark.png into the rpm/SOURCES directory.
svn path=/trunk/; revision=47534
2013-02-07 17:37:38 +00:00
Jeff Morriss 07546a7279 Fix installation of wireshark.desktop (create the directory first)
svn path=/trunk/; revision=47507
2013-02-06 02:45:22 +00:00
Jeff Morriss 47ed58ce0d Use DESTDIR when installing desktop files.
svn path=/trunk/; revision=47483
2013-02-05 03:58:56 +00:00
Guy Harris 74b8ef79b1 At least as I read
http://www.gnu.org/software/automake/manual/automake.html#index-g_t_0040code_007bAM_005fDEFAULT_005fVERBOSITY_007d-1018

this is the way to do the silent-rules stuff; using nested variable
expansion in Makefile.am causes warnings when running autogen.sh.

svn path=/trunk/; revision=47474
2013-02-04 18:53:50 +00:00
Gerald Combs c0ca6220ef Prettify more build output.
svn path=/trunk/; revision=47469
2013-02-04 17:22:32 +00:00
Guy Harris f2beeac1d0 Try creating a script for Debian and derivatives that will grab the
packages necessary for Wireshark development, using apt-get.

svn path=/trunk/; revision=47460
2013-02-04 00:29:27 +00:00
Guy Harris 58b5fc9ebf For Qt 5, we need to link with the QtWidgets and QtPrintSupport
libraries as well, at least on OS X.

svn path=/trunk/; revision=47437
2013-02-02 04:00:52 +00:00
Gerald Combs 7187abf120 Add $(AM_V_GEN) in a few more places.
svn path=/trunk/; revision=47434
2013-02-01 22:57:41 +00:00
Jeff Morriss 3f52d77072 Try not including radius/Custom.make in radius_DATA: I think including it means it gets distributed. (Anyway it's needed for building, it doesn't need to be installed.)
svn path=/trunk/; revision=47243
2013-01-24 02:26:43 +00:00
Anders Broman bbb0e8f802 Add an SKT.xml file.
svn path=/trunk/; revision=47227
2013-01-23 14:50:57 +00:00
Anders Broman 81bfbcc7e5 Missing space?
svn path=/trunk/; revision=47226
2013-01-23 14:40:17 +00:00
Anders Broman 90844413fe svn path=/trunk/; revision=47225 2013-01-23 13:12:38 +00:00
Anders Broman fceeb16e66 Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifications to include the file in the tarball.
svn path=/trunk/; revision=47224
2013-01-23 12:08:15 +00:00
Gerald Combs 3d280a8c95 Replace more XPMs with PNGs.
svn path=/trunk/; revision=47159
2013-01-19 05:48:43 +00:00
Gerald Combs a50850c0cd Fix UI library dependency checking.
svn path=/trunk/; revision=46902
2013-01-02 19:19:10 +00:00
Gerald Combs 28a69c080f Try to force configure to pick up CXXLINK.
svn path=/trunk/; revision=46892
2013-01-02 04:25:45 +00:00
Gerald Combs ac922ec704 Try a simpler and hopefully more reliable method of linking.
svn path=/trunk/; revision=46890
2013-01-02 03:50:19 +00:00
Gerald Combs a689b032f6 Make sure we don't try to distribute nonexistent files.
svn path=/trunk/; revision=46888
2013-01-02 01:17:07 +00:00
Gerald Combs b62d650ba1 Play Three-card^WTwo-link-target Monte with Autotools.
svn path=/trunk/; revision=46887
2013-01-01 23:39:00 +00:00
Gerald Combs 7e30804155 Automake's "dummy.cpp" trick is all-or-nothing. Instead of forcing
everyone to use a c++ compiler conditionally link with -lstdc++
and hope for the best.

svn path=/trunk/; revision=46879
2012-12-31 22:57:44 +00:00
Gerald Combs 4ecf61b0df If we're linking with Qt pass a hint to automake that it needs to use c++
linking.

svn path=/trunk/; revision=46878
2012-12-31 21:29:47 +00:00
Gerald Combs b6382033e1 It might help for the Qt version of Wireshark to link against the Qt
libraries and to have a main() function. Replace some manual Makefile
rules with an implicit rule.

svn path=/trunk/; revision=46875
2012-12-31 19:07:38 +00:00
Alexis La Goutte 8aae1e58bf Add new images to Makefile.am
svn path=/trunk/; revision=46873
2012-12-31 15:08:36 +00:00
Gerald Combs 7256f90069 Make sure we link Wireshark with the right UI library.
svn path=/trunk/; revision=46869
2012-12-31 06:09:19 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Alexis La Goutte fc22650de4 Update Dictonary from FreeRadius(-server) Master branch https://github.com/FreeRADIUS/freeradius-server
Add RFC 5447 dictionary
9b98830314

Add RFC 6519 dictionary
383a997181

Add RFC 6572 dictionary
8cc6e5a04d

svn path=/trunk/; revision=46722
2012-12-23 18:40:40 +00:00
Jeff Morriss 935b4904d4 Add a new target: install_desktop_files which installs some files for
use with a freekdesktop (at least I think so).  This stuff was taken from
Fedora's Wireshark RPM.

The intent is to a) use Wireshark's own files and b) remove most of the manual
installation steps from RPMs.

svn path=/trunk/; revision=46623
2012-12-19 22:51:51 +00:00
Jeff Morriss b10f83c531 Add wireshark-mime-package.xml to EXTRA_DIST.
svn path=/trunk/; revision=46621
2012-12-19 21:01:00 +00:00
Jeff Morriss 8a916449e5 As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8076 :
Enable PIE (if the compiler supports it) when compiling dumpcap.  Do this
regardless of whether we're configured to install dumpcap setuid-root because
some users will end up running dumpcap as root regardless of how we were
configured.

svn path=/trunk/; revision=46608
2012-12-19 02:09:48 +00:00
Michael Tüxen 0461a705c0 text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see).
svn path=/trunk/; revision=46600
2012-12-18 22:56:06 +00:00
Gerald Combs 07898cae39 Create 16x16 and 24x24 versions of the document icon with a contrasting
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.

svn path=/trunk/; revision=46413
2012-12-05 22:28:12 +00:00
Alexis La Goutte 126c3f8b88 From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE):
  file Internal CMake error when trying to open file:
  /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading.
Call Stack (most recent call first):
  ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES)
...

From me:
Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common

svn path=/trunk/; revision=46217
2012-11-27 09:18:42 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris 24d4323da6 Assume, at least for now, that "Darwin" means "OS X"; don't bother
checking whether the relevant frameworks are available.  (An iOS port's
going to require a *lot* more work, and I don't know whether
Darwin-the-pure-OS even builds and runs any more.)

We don't need Core Services any more, as we're no longer using
Gestalt().  We just need Core Foundation for getting the OS version and
Application Services for firing up Web browser or file manager windows.

svn path=/trunk/; revision=46129
2012-11-22 05:46:49 +00:00
Guy Harris 69a454c744 Fix indentation.
svn path=/trunk/; revision=46126
2012-11-22 02:02:08 +00:00
Anders Broman 28474fe8ef From Mike Garratt:
Friendly Names for interfaces on Windows

Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
  + Win32: "dumpcap -D" shows friendly_name in place of descript if known
  + All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
  + When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name). 
  + console_display_name is used as the basis of the autogenerated temp
filenames
  + console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
  + Can now specify the interface using its name and friendly_name
  + Interface name matching is case insenstive
  + Name matching first attempts exact matching, then falls back to prefix
matching
    (e.g. dumpcap -i local)
  + Validates interface names, instead of blindly sending them off to
winpcap/libpcap
  + Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
  + Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
  + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name.  Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
  + void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
  + Now uses wireshark_pcapng_* or  wireshark_pcap_* depending on file format
  + Basis temp filename format on console_display_name
  + Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing) 

GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
  + "Friendly Name" renamed to "NDIS Friendly Name"
  + Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
  + The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
    Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces. 
  + Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"

svn path=/trunk/; revision=46083
2012-11-19 20:07:27 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
2012-10-21 19:12:18 +00:00
Anders Broman 1f867e7901 Include setup.ini in the tarball.
Copy setup.ini to etc/gtk-3.0

svn path=/trunk/; revision=45497
2012-10-12 12:36:22 +00:00
Anders Broman f0472792e2 - Add Nokai Siemens Networks AVP.
- Add a few enums to Event-Trigger
- Reformat the Nokia file a bit.

svn path=/trunk/; revision=45427
2012-10-09 14:10:31 +00:00
Anders Broman 9f38a46974 From GeorgiaK:
Add Nokia AVP:s

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7799

svn path=/trunk/; revision=45385
2012-10-08 14:20:34 +00:00
Gerald Combs 113d731ed8 Remove the previous distribution file.
svn path=/trunk/; revision=45328
2012-10-04 22:51:23 +00:00
Gerald Combs 361063457e Add a "patch-bzip2" target which creates a patch from the previous micro
release.

svn path=/trunk/; revision=45323
2012-10-04 19:37:03 +00:00
Martin Mathieson 60fb63783a From Jim Young, bug 7745.
Add Makefile support for reordercap.

svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
Gerald Combs f6c7b3e533 libgtkui_dirty → libui_dirty.
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
Gerald Combs 5e68ebc9b0 Make sure osx-dmg.sh is executable.
svn path=/trunk/; revision=44573
2012-08-19 01:16:42 +00:00
Guy Harris 9d4ab6a4f4 Patching configure.in files and regenerating them is a bag of hurt, as
it can depend on, among other things, having the the relevant .pc files
in one of the directories in PKG_CONFIG_PATH.  Instead, just don't
request a fat build of PortAudio.

svn path=/trunk/; revision=44457
2012-08-12 19:32:46 +00:00