Commit Graph

727 Commits

Author SHA1 Message Date
Gerald Combs a81424382e Be more consistent with the name "Wireshark" and its two UI
flavors. Upgrade the Qt flavor from "experimental" to "alpha".  I also
apologize in advance to all of the people who installed previous versions
of the 1.11.x packages and who will now have extra shortcuts lying around.

svn path=/trunk/; revision=53952
2013-12-11 22:29:05 +00:00
Chris Maynard 1bd68e7adb Trivial: Fix typo.
svn path=/trunk/; revision=53937
2013-12-11 15:20:29 +00:00
Jörg Mayer 244000000d - Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlying
pcap probably is different from the WinPcap version.
- Set WINPCAP_VERSION for cmake builds to "unknown"
- Oh, the NEWS file changed again.

svn path=/trunk/; revision=53690
2013-12-01 10:05:16 +00:00
Jeff Morriss 69017ac3bd Overhaul rpm-building options a bit: as suggested by Anders, have the RPM follow
./configure's options for gtk2 vs gtk3 vs qt.

Make it possible to not build the GNOME package (now both UIs' packages are
optional).  I think Chris requested this a while ago.

If this works out it may make sense to control the rest of the options via
./configure .

svn path=/trunk/; revision=53607
2013-11-26 23:43:18 +00:00
Jeff Morriss ebc4cbc74e Attempt to fix Qt dependencies for SUSE.
svn path=/trunk/; revision=53490
2013-11-21 20:20:29 +00:00
Gerald Combs fd95b3d400 Instead of installing a script named "utility-launcher" and renaming it,
install a script named "wireshark".

svn path=/trunk/; revision=53356
2013-11-16 02:34:36 +00:00
Gerald Combs b073be77c1 Try reverting 01wireshark.xml to r53280.
svn path=/trunk/; revision=53354
2013-11-16 01:16:14 +00:00
Gerald Combs 09dc9a3d0a Try removing XML headers.
svn path=/trunk/; revision=53352
2013-11-16 00:27:19 +00:00
Gerald Combs f954245491 Revert some inadvertent changes from the last commit.
svn path=/trunk/; revision=53329
2013-11-14 22:52:05 +00:00
Gerald Combs 1745e131fc Create a plural-only English translation. Use it to pluralize the Follow
Stream and Flow Graph hint statistics.

svn path=/trunk/; revision=53326
2013-11-14 22:35:10 +00:00
Jeff Morriss 6b7ab3bd33 Make subpackage Requires: more generic.
svn path=/trunk/; revision=53300
2013-11-13 16:16:06 +00:00
Jeff Morriss 78f8757560 Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessary
desktop-integration files); build it by default.

Use 'alternatives' to choose which GUI actually gets used; give the Gtk
GUI priority over the Qt one (for now).

svn path=/trunk/; revision=53297
2013-11-13 03:01:42 +00:00
Gerald Combs 3009823060 Simplify the CLI preinstall script a bit and hopefully get rid of an error.
svn path=/trunk/; revision=53296
2013-11-13 02:50:25 +00:00
Gerald Combs 30bdf66b1f Fix permissions for installed OS X files and directories.
Add a cli-preinstall script that creates missing parts of the
installation path and sets their permissions. Simply copy
"utility-launcher" to "wireshark" instead of renaming it at install
time. Explicitly set its ownership and permissions. Pretty-print some of
the PackageMaker XML files via `xmllint --format --recover`.

svn path=/trunk/; revision=53281
2013-11-12 20:38:58 +00:00
Pascal Quantin 628dda9d2c From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :
Add support for Alcatel-Lucent 8950 AAA

svn path=/trunk/; revision=53258
2013-11-11 21:13:55 +00:00
Gerald Combs d111d15be2 "productsign" should work now. Remove "codesign".
svn path=/trunk/; revision=53243
2013-11-10 21:53:03 +00:00
Gerald Combs 1fc8fd9ba2 Be exceedingly diligent about checking OS X package signatures.
svn path=/trunk/; revision=53242
2013-11-10 21:44:50 +00:00
Gerald Combs 2965a6bf25 Add missing backslash.
svn path=/trunk/; revision=53212
2013-11-10 01:52:06 +00:00
Gerald Combs 04a7231d91 More packaging updates.
Specify "Application" or "Installer" code signing identities as needed.
Switch back to productbuild for the package. That seems to be the
correct utility to use. Give the package an ID. Package signing is still
broken but this appears to be closer to being correct.

svn path=/trunk/; revision=53211
2013-11-10 01:31:25 +00:00
Gerald Combs 48c5a9ae37 Bump LSMinimumSystemVersion to 10.6.
svn path=/trunk/; revision=53210
2013-11-10 01:25:38 +00:00
Gerald Combs f50535856a Fix argument order.
svn path=/trunk/; revision=53209
2013-11-10 00:39:09 +00:00
Gerald Combs e8106d01c9 Try switching back to codesign.
svn path=/trunk/; revision=53208
2013-11-10 00:24:56 +00:00
Gerald Combs 9f163b787d Sign the right file.
svn path=/trunk/; revision=53203
2013-11-09 19:22:42 +00:00
Gerald Combs 970b0a0245 Older versions of productsign don't support "--force" or "--verbose".
svn path=/trunk/; revision=53202
2013-11-09 19:00:19 +00:00
Gerald Combs c7f980342e Try to simplify package signing.
According to the packagemaker man page, '--target 10.5' will produce a
flat package. Use it instead of pkgutil.

svn path=/trunk/; revision=53201
2013-11-09 18:39:58 +00:00
Gerald Combs 3a21ccdeba Try to perform package signing as described at
http://stackoverflow.com/questions/11487596/making-os-x-installer-packages-like-a-pro-xcode4-developer-id-mountain-lion-re

We *might* have to switch away from packagemaker in order to be able to
sign packages properly.

svn path=/trunk/; revision=53199
2013-11-09 17:52:54 +00:00
Gerald Combs 3f385b31ab Print LC_VERSION_MIN_MACOSX for each executable and library.
svn path=/trunk/; revision=53145
2013-11-07 17:55:46 +00:00
Gerald Combs 2c85824a46 From bkpsu via bug 9374:
Minor grammar error in the NSIS installer script messageBox for
"isRunning" section. "one is associated" should be changed to "one of
its associated"

svn path=/trunk/; revision=53050
2013-11-02 16:17:23 +00:00
Gerald Combs ba49d9bcf0 Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.

svn path=/trunk/; revision=52941
2013-10-29 04:05:27 +00:00
Gerald Combs 66558ef5a8 Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
2013-10-28 22:11:51 +00:00
Gerald Combs 31db0135f4 Add some verbosity.
svn path=/trunk/; revision=52929
2013-10-28 19:09:58 +00:00
Gerald Combs 69741d086b Remove U3 code and packaging.
svn path=/trunk/; revision=52896
2013-10-27 17:15:39 +00:00
Jeff Morriss 0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Gerald Combs 7a3febacac Exit if we're building with Qt and we can't find macdeployqt.
svn path=/trunk/; revision=52853
2013-10-25 21:37:30 +00:00
Gerald Combs 2dd3a651e6 Code signing updates.
Sign executables, libraries, frameworks, plugins, and bundles as per the
Code Signing Guide. Check our work with spctl. Use "bundle" to
differentiate what we're doing with the package script.

svn path=/trunk/; revision=52746
2013-10-21 20:06:14 +00:00
Gerald Combs 98f3bb5f15 Sign all of the executables.
svn path=/trunk/; revision=52663
2013-10-17 22:34:38 +00:00
Gerald Combs c4dcd0ca24 If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
installer package. Add commented-out code to sign the .dmg as well in
case Apple supports that in the future.

svn path=/trunk/; revision=52633
2013-10-15 23:03:48 +00:00
Gerald Combs 9011036f76 Look for QtWidgets in the right directory.
svn path=/trunk/; revision=52601
2013-10-14 17:23:58 +00:00
Gerald Combs 7a1a387d51 Fixes for the utility-launcher script.
If we don't find Wireshark.app in WIRESHARK_APP_DIR or
/Applications/Wireshark.app, look for it using its bundle ID. Add a
description of this process to the Read Me First files. Look for
executables in the right subdirectory depending on our UI flavor.

Make sure we don't add GTK+-specific items to the app bundle if we're
using Qt.

svn path=/trunk/; revision=52502
2013-10-10 17:30:56 +00:00
Gerald Combs 6a8ceca13a Sometimes we need to @rpathify libraries from more than one directory.
Instead of trying to match libraries from $LIBPREFIX, exclude libraries
that aren't in well-known system paths and which haven't previously been
@rpathified.

svn path=/trunk/; revision=52479
2013-10-09 20:49:12 +00:00
Gerald Combs 69473b4645 Use a plain package name even if we're building with GTK3. Hopefully
we're beyond the "experimental" stage now.

svn path=/trunk/; revision=52453
2013-10-08 20:21:36 +00:00
Gerald Combs 9f45bac313 Try to fix building the GTK flavor OS X app.
svn path=/trunk/; revision=52442
2013-10-07 19:37:22 +00:00
Guy Harris 438f4be98a More debugging.
svn path=/trunk/; revision=52376
2013-10-05 09:13:14 +00:00
Guy Harris b9eecb6f28 Report what file we were using to determine the architecture.
svn path=/trunk/; revision=52340
2013-10-03 00:33:30 +00:00
Guy Harris 1b9b3dc8eb Undo my previous manual undo of an RTF change made by the Mountain Lion
version of TextEdit, so that this is solely the result of TextEdit.

svn path=/trunk/; revision=52324
2013-10-01 21:54:20 +00:00
Gerald Combs 4c1696960b Add Wireshark back to the GTK+ package.
svn path=/trunk/; revision=52323
2013-10-01 21:43:51 +00:00
Guy Harris e83ce4b4ea We install the wrapper scripts for the command-line tools in
/usr/local/bin, not in /Library/Wireshark.

svn path=/trunk/; revision=52322
2013-10-01 21:41:54 +00:00
Gerald Combs 99f457bd03 Use separate "Read me first" files for Qt and GTK+.
svn path=/trunk/; revision=52321
2013-10-01 21:04:13 +00:00
Gerald Combs 2d1b16fb26 The Qt executables shouldn't need any wrappers. Just copy them over
as-is.

svn path=/trunk/; revision=52303
2013-09-30 17:33:59 +00:00
Gerald Combs 5687b33b4e Make sure we copy Wireshark's libraries to Frameworks. Use top_builddir
instead of top_srcdir. It shouldn't make any difference in our case but
it's more correct.

svn path=/trunk/; revision=52302
2013-09-30 17:19:48 +00:00