aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte33-63/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-1/+1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-19The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]Alexis La Goutte1-1/+1
Issue found by rols The installer puts the normal included plugins (e.g. mate, wimax) in /Applications/Wireshark.app/Contents/Frameworks/wireshark/plugins, however the global plugins directory is set to /Applications/Wireshark.app/Contents/Resources/lib/wireshark/plugins (as it was in previous versions) so no plugins load at startup. In order to make them load you have to create this directory and copy the plugins there, or put them in your personal directory. From remark of Gerald, use recommandation of Bundle Programming Guide (use Contents/PlugIns for plugin) https://developer.apple.com/library/mac/documentation/corefoundation/conceptual/cfbundles/BundleTypes/BundleTypes.html#//apple_ref/doc/uid/10000123i-CH101-SW19 Change-Id: Ib1ae7da48a8fa94f7037912cd44c05532a238b71 Closed-bug: 9854 Reviewed-on: https://code.wireshark.org/review/602 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-02Added Cisco Starent Diameter dictionary entries.Josip Medved1-0/+1
Change-Id: Ib7fa98639b6de965148349948ccf86d8c8641fb1 Reviewed-on: https://code.wireshark.org/review/438 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-07Fix warning when use make packaging on WindowsAlexis La Goutte2-5/+4
warning: unknown variable/constant "{PROGRAM_NAME_PATH_GTK}" detected, ignoring (macro:MUI_FUNCTION_FINISHPAGE:387) svn path=/trunk/; revision=54634
2014-01-07The capabilities for dumpcap don't need to be inheritable.Guy Harris1-2/+2
See https://bugzilla.redhat.com/show_bug.cgi?id=1022377 svn path=/trunk/; revision=54630
2014-01-05Fix indent (use 4 spaces) and add modelines and remove trailing whitespaceAlexis La Goutte1-54/+67
svn path=/trunk/; revision=54611
2014-01-05Fix build when use PortablesAPPSAlexis La Goutte1-0/+2
svn path=/trunk/; revision=54607
2014-01-05Fix indent (use 4 spaces)Alexis La Goutte1-162/+162
svn path=/trunk/; revision=54606
2014-01-05Enhance NSIS Windows installer (Wireshark Qt support)Alexis La Goutte4-61/+254
* Add Radiobox to choose File Association (Wireshark GTK or Qt) * Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...) * Fix unistaller (don't remove all icons...) * ... svn path=/trunk/; revision=54604
2014-01-02Don't try to distribute asn1.dll since we no longer build it.Jeff Morriss1-1/+0
svn path=/trunk/; revision=54566
2014-01-02Stop building and distributing the asn1 plugin. I bleleve it to be obsolete.Anders Broman1-1/+0
svn path=/trunk/; revision=54559
2014-01-01Happy new year!Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=54529
2013-12-27From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9576Alexis La Goutte1-1/+0
Replace g_memmove with memmove However there still one move g_memmove related code in "packaging/macosx/native-gtk/glibconfig.h". svn path=/trunk/; revision=54472
2013-12-18Update the example to match the ohter plugins in wireshark.nsi.Chris Maynard1-1/+1
svn path=/trunk/; revision=54230
2013-12-11Be more consistent with the name "Wireshark" and its two UIGerald Combs1-13/+42
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-11Trivial: Fix typo.Chris Maynard1-1/+1
svn path=/trunk/; revision=53937
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer4-17/+17
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-11-26Overhaul rpm-building options a bit: as suggested by Anders, have the RPM followJeff Morriss1-17/+28
./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-21Attempt to fix Qt dependencies for SUSE.Jeff Morriss1-0/+5
svn path=/trunk/; revision=53490
2013-11-16Instead of installing a script named "utility-launcher" and renaming it,Gerald Combs2-1/+1
install a script named "wireshark". svn path=/trunk/; revision=53356
2013-11-16Try reverting 01wireshark.xml to r53280.Gerald Combs1-38/+1
svn path=/trunk/; revision=53354
2013-11-16Try removing XML headers.Gerald Combs2-2/+0
svn path=/trunk/; revision=53352
2013-11-14Revert some inadvertent changes from the last commit.Gerald Combs1-5/+5
svn path=/trunk/; revision=53329
2013-11-14Create a plural-only English translation. Use it to pluralize the FollowGerald Combs2-6/+6
Stream and Flow Graph hint statistics. svn path=/trunk/; revision=53326
2013-11-13Make subpackage Requires: more generic.Jeff Morriss1-2/+2
svn path=/trunk/; revision=53300
2013-11-13Add a (wireshark-)qt package that contains the Qt-based GUI (and the necessaryJeff Morriss1-14/+87
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-13Simplify the CLI preinstall script a bit and hopefully get rid of an error.Gerald Combs1-5/+1
svn path=/trunk/; revision=53296
2013-11-12Fix permissions for installed OS X files and directories.Gerald Combs5-5/+102
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-11From Michael Bean via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9384 :Pascal Quantin1-0/+1
Add support for Alcatel-Lucent 8950 AAA svn path=/trunk/; revision=53258
2013-11-10"productsign" should work now. Remove "codesign".Gerald Combs1-1/+0
svn path=/trunk/; revision=53243
2013-11-10Be exceedingly diligent about checking OS X package signatures.Gerald Combs1-2/+3
svn path=/trunk/; revision=53242
2013-11-10Add missing backslash.Gerald Combs1-1/+1
svn path=/trunk/; revision=53212
2013-11-10More packaging updates.Gerald Combs2-4/+5
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-10Bump LSMinimumSystemVersion to 10.6.Gerald Combs1-1/+1
svn path=/trunk/; revision=53210
2013-11-10Fix argument order.Gerald Combs1-1/+1
svn path=/trunk/; revision=53209
2013-11-10Try switching back to codesign.Gerald Combs1-4/+5
svn path=/trunk/; revision=53208
2013-11-09Sign the right file.Gerald Combs1-1/+1
svn path=/trunk/; revision=53203
2013-11-09Older versions of productsign don't support "--force" or "--verbose".Gerald Combs1-1/+1
svn path=/trunk/; revision=53202
2013-11-09Try to simplify package signing.Gerald Combs1-6/+2
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-09Try to perform package signing as described atGerald Combs1-5/+14
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-07Print LC_VERSION_MIN_MACOSX for each executable and library.Gerald Combs1-0/+9
svn path=/trunk/; revision=53145
2013-11-02From bkpsu via bug 9374:Gerald Combs1-1/+1
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-10-29Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,Gerald Combs2-3/+2
the PortableApps version relies on U3_-prefixed environment variables. svn path=/trunk/; revision=52941
2013-10-28Remove some (but not all) U3 remnants.Gerald Combs2-2/+3
svn path=/trunk/; revision=52935
2013-10-28Add some verbosity.Gerald Combs1-0/+2
svn path=/trunk/; revision=52929
2013-10-27Remove U3 code and packaging.Gerald Combs15-2091/+1
svn path=/trunk/; revision=52896