Commit Graph

652 Commits

Author SHA1 Message Date
Gerald Combs 916c1c5c01 Add global profiles.
svn path=/trunk/; revision=49127
2013-05-01 23:17:30 +00:00
Gerald Combs a6cd9fdc44 Change the right title this time.
svn path=/trunk/; revision=49126
2013-05-01 22:22:10 +00:00
Gerald Combs b38556fa1e Use "Global" to match the other entries.
svn path=/trunk/; revision=49125
2013-05-01 22:14:48 +00:00
Gerald Combs dd83985381 Profiles → Global Profiles.
svn path=/trunk/; revision=49124
2013-05-01 22:13:51 +00:00
Gerald Combs 4b4542045c Install and uninstall our global profiles.
svn path=/trunk/; revision=49123
2013-05-01 22:06:49 +00:00
Gerald Combs 160af64058 State that we don't support U3 any more.
svn path=/trunk/; revision=49090
2013-04-29 23:08:31 +00:00
Pascal Quantin fd13812247 Add China Telecom AVP:s to Windows installer
svn path=/trunk/; revision=49018
2013-04-24 18:04:33 +00:00
Gerald Combs d18230de70 Install QtShark by default.
svn path=/trunk/; revision=49001
2013-04-23 18:32:11 +00:00
Guy Harris 51b56bfebc Update FSF address.
svn path=/trunk/; revision=48892
2013-04-17 01:44:00 +00:00
Jeff Morriss a995cb8220 Simplify the check for rpmbuild's version.
svn path=/trunk/; revision=48612
2013-03-28 14:17:38 +00:00
Gerald Combs 70d0c6067f Update the OS X application icon.
svn path=/trunk/; revision=48566
2013-03-26 20:12:52 +00:00
Gerald Combs 8fa78c9cd3 Note that SanDisk deprecated U3 in 2009.
svn path=/trunk/; revision=48335
2013-03-16 00:00:21 +00:00
Gerald Combs 035d5b231e Use a larger LZMA dictionary.
svn path=/trunk/; revision=48328
2013-03-15 21:46:25 +00:00
Jeff Morriss 041fbc05ed SuSE's suse_update_desktop_file macro BuildRequires update-desktop-files.
svn path=/trunk/; revision=48298
2013-03-14 16:56:19 +00:00
Gerald Combs a7cef5b7c8 Prettify the WinPcap version display.
svn path=/trunk/; revision=48250
2013-03-11 19:12:17 +00:00
Gerald Combs 7613251d1c Switch to WinPcap 4.1.3.
svn path=/trunk/; revision=48207
2013-03-09 01:20:09 +00:00
Jeff Morriss 6eb2e2899a freekdesktop.org says all themes must fall back to 'hicolor' if they don't find
a theme-specific icon (and as such hicolor is where applications should
install their icons).  So: don't install some of our icons in the gnome area,
install them all in hicolor.

While we're at it, go ahead and install all the icon sizes we have.

If we're on SuSE, use their desktop-file-updater macro; without that they
won't recognize our desktop file.

Fix bug which prevented the MIME database from being updated if our install
prefix is not /usr .

svn path=/trunk/; revision=48204
2013-03-08 23:40:37 +00:00
Gerald Combs a606a88647 Add /SD defaults to every MessageBox call (even if they're commented
out). Fixes bug 8451.

Don't yell at the user so much.

svn path=/trunk/; revision=48196
2013-03-08 18:23:58 +00:00
Jeff Morriss 45a75522ed List more (obvious) build dependencies.
The problem with listing these package names (which I think is convenient)
is that different distros have different names for some packages.  So:
update to work on OpenSuSE.

svn path=/trunk/; revision=48160
2013-03-07 03:50:28 +00:00
Gerald Combs ed0d988323 Update the changelog.
svn path=/trunk/; revision=48151
2013-03-06 23:06:09 +00:00
Gerald Combs e5e1372d7e Enable c-ares support by default to match the Windows and Debian
packages (and to make things less painful if the user enables name
resolution). Untested.

svn path=/trunk/; revision=48150
2013-03-06 23:04:43 +00:00
Gerald Combs 75847e552a "HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark.org/\Wireshark\WinSparkle" isn't the prettiest registry path.
svn path=/trunk/; revision=48089
2013-03-05 18:46:50 +00:00
Jeff Morriss 663e6a6d6b Make it so that alternate-prefix RPM builds actually work.
Use the prefix from 'configure' in the RPM (so: to build an RPM which installs
in /opt do "./configure --prefix=/opt && make rpm-package").

(Maybe this approach should also be used for the other options in the .spec
file.)

Only clean up if building the RPM was successful.

svn path=/trunk/; revision=47957
2013-02-28 23:02:38 +00:00
Jeff Morriss 98ce5836a4 Add a %prefix option for users who want to (easily) configure Wireshark to
install in a non-standard location.

Assume the desktop-integration stuff goes in /usr (regardless of our prefix).

This (with r47914) fixes RPM generation when someone uses a prefix other than
/usr .


Also: run desktop-file-validate on the wireshark.desktop file (just in case it
wasn't installed with desktop-file-install).

svn path=/trunk/; revision=47916
2013-02-27 16:12:19 +00:00
Alexis La Goutte 7dcc02efac Fix Build of PortableAPPs with Qtshark
svn path=/trunk/; revision=47833
2013-02-23 09:58:46 +00:00
Alexis La Goutte c4851a88ac Add QtShark stuff to PortableApps
svn path=/trunk/; revision=47825
2013-02-22 16:51:43 +00:00
Martin Kaiser 38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly
svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
Gerald Combs c1963df0a7 Remove vcredist_??.exe when we're done with it.
svn path=/trunk/; revision=47788
2013-02-21 01:03:47 +00:00
Gerald Combs 63ef23bf5f Pop into the correct variable.
svn path=/trunk/; revision=47786
2013-02-21 00:55:25 +00:00
Gerald Combs ab79e59866 Move the Wireshark-is-running check to a common macro and call it in
both the installer and uninstaller. Roll the .exe removal code into a
loop and add missing executables.

Add modelines and adjust accordingly.

svn path=/trunk/; revision=47785
2013-02-20 23:59:49 +00:00
Gerald Combs 3ba2c108f1 As http://www.jrsoftware.org/iskb.php?mutexsessions points out, a session
mutex may not be visible to other sessions and we may not be able to
create a global mutex. Try to create both, and make each one accessible
to all users. Update the NSIS installer to check for both global and
session mutexes.

svn path=/trunk/; revision=47773
2013-02-20 19:58:55 +00:00
Gerald Combs bd4cffae58 When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.

svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
Gerald Combs e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Gerald Combs a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Jeff Morriss 6484e0c9f7 Perl is required to build Wireshark, add it to BuildRequires.
svn path=/trunk/; revision=47531
2013-02-07 16:33:17 +00:00
Jeff Morriss f24dafa0f5 Overhaul to make this file more useful/up to date. Many changes are based on
Fedora's .spec file.  Changes include:
  - Create a separate wireshark-gnome package (like Redhat).
  - Control some things with variables set at the top of the file.
    - Allow the user to configure how dumpcap is installed.
    - Allow the user to choose some options including GTK2 or GTK3.
  - Greatly expand the BuildRequires entries; get the minimum versions of some
    things from 'configure'.
  - Install freedesktop files for better (free)desktop integration.

svn path=/trunk/; revision=47528
2013-02-07 03:09:47 +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 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 a377c7c38d Generate Info.plist using CMake and enable it in QtShark.pro. Update the dates.
svn path=/trunk/; revision=47143
2013-01-18 01:37:27 +00:00
Guy Harris 80e599e411 Don't assume developer tools are under /Developer - look for
/Applications/Xcode.app/Developer first (for Xcode 4 and later) and, if
we don't find that, look for /Developer.

Don't assume packagemaker is under $developer_path/usr/bin - with Xcode
4, you need to install Auxiliary Tools for Xcode to get PackageMaker,
and even that doesn't directly install the packagemaker command, so we
currently advise people to copy the PackageMaker binary to
/usr/bin/packagemaker.

svn path=/trunk/; revision=46957
2013-01-05 23:31:08 +00:00
Guy Harris 2b3849b3d8 Default to LIBPREFIX being /usr/local, as that's where macosx-setup.sh
puts them.  If you choose to use MacPorts versions of the library, edit
the script or run it with -l.

Update the usage message and fix a typo.

svn path=/trunk/; revision=46955
2013-01-05 23:11:38 +00:00
Guy Harris a70b2c5208 Don't assume that, in the output of the file command, the architecture
appears at the end - if the user's installed an up-to-date version of
file to, for example, get pcap-ng files identified (Apple hasn't updated
file in *ages* - they're still in file 5.04!), it will report, for
example, "Mach-O 64-bit x86_64 executable" rather than "Mach-O 64-bit
executable x86_64" for an x86-64 binary.

svn path=/trunk/; revision=46954
2013-01-05 23:07:05 +00:00
Guy Harris 3fdc413fd6 In the post-install script, get rid of plugins that got converted to
built-in dissectors in 1.8.  Hopefully, this will smash bug 7401.

svn path=/trunk/; revision=46945
2013-01-05 10:06:05 +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
Chris Maynard 4ca2e780bf Fix trivial typo.
svn path=/trunk/; revision=46448
2012-12-07 20:02:01 +00:00
Martin Mathieson f5b9238ed6 Make list of file extensions to register display properly, using 3 text
lines rather than 2.  Add 2 new extensions to common.nsh.
Not sure if changes to wireshark.ini are necessary, copied what was done
for "Field 7", which is also just a label.

svn path=/trunk/; revision=46337
2012-12-02 23:55:44 +00:00
Gerald Combs 04fea80bf8 From Sho Amano via bug 7914:
If the source codes are checked out using TortoiseSVN on Windows,
"nmake -f Makefile.nmake packaging_papps" fails in the middle.

This is because the line end of packaging\nsis\wireshark.nsi is CRLF in
this case, and ws-manifest.pl cannot handle such case.

svn path=/trunk/; revision=45798
2012-10-26 15:51:28 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
Anders Broman df44255d07 - Use PROGRAM_NAME in the unistaller too.
- Make it possible to set PROGRAM_NAME in environment.
- Update the comment about setting program name it *should* work now.

svn path=/trunk/; revision=45582
2012-10-16 14:03:42 +00:00
Anders Broman 688ffbb464 Use PROGRAM_NAME in more places.
Missing fro previous commit.

svn path=/trunk/; revision=45576
2012-10-16 08:16:40 +00:00