summaryrefslogtreecommitdiff
path: root/packaging
AgeCommit message (Collapse)AuthorFilesLines
2015-11-07NSIS: clear errors before checking WinPcap uninstall registry entryPascal Quantin1-2/+4
Otherwise it can lead to a false verdict in after the check for Wireshark uninstall registry entry Bug: 10867 Change-Id: I213ac8ffadfb3578b05d33b996540bd4330a0ec5 Reviewed-on: https://code.wireshark.org/review/11621 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from commit cdcf27255ab8907e7fe29b4518fca1c4e53202ab) Reviewed-on: https://code.wireshark.org/review/11623
2015-08-25win32: add detection of Npcap to Windows installerPascal Quantin2-5/+29
If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31 Reviewed-on: https://code.wireshark.org/review/10197 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Yang Luo <hsluoyz@sohu.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit d5049eaba76055ffc1104536cec59e2163c8d003) Reviewed-on: https://code.wireshark.org/review/10255
2015-05-29Make the XQuartz fixer a separate subpackage.Guy Harris6-18/+24
That appears to be what PackageMaker or whatever it's called wants. Make it a hidden package that gets installed by default. Change-Id: Ib834f0dd8914b768fa2c26d45c3faf69c1494941 Bug-Ping: 10640 Reviewed-on: https://code.wireshark.org/review/8680 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Get rid of trailing blank line.Guy Harris1-1/+0
Change-Id: I9fd8cec0aac1a44fe84cab3e2c4be5d26b76e721 Reviewed-on: https://code.wireshark.org/review/8614 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Put the XQuartz fixer into a separate launchd daemon.Guy Harris6-35/+65
That's a bit cleaner, and also allows it to run if we are updating an existing Wireshark installation - the ChmodBPF job won't be rerun if it was already there, as launchd will say "hey, that's already running" and won't re-run it. Change-Id: Ib453ccaa5ad4405f4e8687e05c4a6cbd084b3458 Reviewed-on: https://code.wireshark.org/review/8613 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Try fixing broken XQuartz installations in ChmodBPF.Guy Harris1-0/+34
That's a lot simpler than trying to run a fixer in Wireshark.app, and it happens without bothering the user. Bug: 10640 Change-Id: I35875d6f2e7efb7e0944ea5a1219c957718e69bf Reviewed-on: https://code.wireshark.org/review/8612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Trying to fix the /usr/X11 link in Wireshark.app is too much trouble.Guy Harris5-268/+32
Back that fix out; I'll look at fixing it in ChmodBPF instead - it already runs as root, so it has the necessary privileges. Change-Id: Ia1078a9ab7e71ef07bce12777e2b550978df7e0d Reviewed-on: https://code.wireshark.org/review/8611 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24OK, let's see if weak-linking it works.Guy Harris1-5/+12
Xcode + project that has to work on a large range of OS X versions = large amounts of pain. Remember, shiny+new = good! Old = bad! Kick old stuff to the curb, just as Apple does! Change-Id: Icd4b02d6bbac3f52076a02b6f2738285cd813e8d Reviewed-on: https://code.wireshark.org/review/8606 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Manually remove the ServiceManagement framework.Guy Harris1-16/+0
I think this is the project used when building on 10.6 for 10.5, and the 10.5 SDK doesn't have the ServiceManagement. Change-Id: Ibfb37131720acbd89b405824f0d3ec42b528caac Reviewed-on: https://code.wireshark.org/review/8605 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-24Fix all the other tests for "can use ServiceManagement framework".Guy Harris1-7/+13
Change-Id: I7e13d7898f3bcb68c05dfcb68544997214483598 Reviewed-on: https://code.wireshark.org/review/8604 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Do the check for "building for pre-10.6" in a way that works.Guy Harris1-2/+5
won't work, because MAC_OS_X_VERSION_10_6 isn't defined by the 10.5 SDK, which apparently makes the #if succeed rather than failing. Go figure. Just check whether MAC_OS_X_VERSION_10_6 is defined, instead. Change-Id: I65df48a5ee7ebca12c77863e2813365fe15e3b5d Reviewed-on: https://code.wireshark.org/review/8603 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Include <AvailabilityMacros.h> to get stuff defined.Guy Harris1-0/+1
Change-Id: Ib5a5e282191b60cdc45f299a550adbd1416bdee9 Reviewed-on: https://code.wireshark.org/review/8602 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Don't use the ServiceManagement framework when building for 10.5.Guy Harris1-1/+31
The 10.5 SDK doesn't have that framework, so we can't use it. All three people for whom it's important that they be able to upgrade their Leopard box, running Wireshark, release by release, all the way up to Yosemite, and have Wireshark repair the damage done by the Yosemite installer to the XQuartz installation a previous upgrade required, cried bitter tears. Change-Id: I9359da5ba8d5896d98fd3f15a14107822a65df70 Reviewed-on: https://code.wireshark.org/review/8601 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Manually add the ServiceManagement framework.Guy Harris1-0/+16
Change-Id: Id54ff9bb93f09b3636863bf02490b4d19696322e Reviewed-on: https://code.wireshark.org/review/8600 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Fix path for ServiceManagement framework; make it absolute like others.Guy Harris1-1/+1
Change-Id: I54f92182aea6adc623c1a3bfb916646aaf87d1a6 Reviewed-on: https://code.wireshark.org/review/8599 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Pop up error dialogs and quit if we don't have a working X11.Guy Harris1-55/+121
If XQuartz is missing the /usr/X11 symlink but the user doesn't allow us to fix it, don't try to run Wireshark. If the OS has X11 bundled but the user didn't install it, let them know, and don't try to run Wireshark. We should probably just say "your X11/XQuartz is hosed" for other problem cases. Get rid of some debugging fprintfs while we're at it. Change-Id: I6ef4581e9a45967b4cda709c4be25dad41a9613d Reviewed-on: https://code.wireshark.org/review/8598 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Include XQuartzFixer.c in the tarball.Guy Harris1-0/+1
Bug: 10640 Change-Id: Ia9d1589a641241ae47ef9c60664896eeb65cfff3 Reviewed-on: https://code.wireshark.org/review/8596 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-23Have Wireshark.app try to fix broken XQuartz installations.Guy Harris4-4/+126
If the user had a pre-Yosemite system with XQuartz installed, and upgraded to Yosemite, the Yosemite installer will have removed the /usr/X11 symlink. If we have /opt/X11 but not /usr/X11, ask the user if we should fix the XQuartz installation and, if they say to do so, run a little helper as root in order to re-install the symlink. Bug: 10640 Change-Id: I0495bd60b7c913ad04eb4ef62817dc39bcebefe7 Reviewed-on: https://code.wireshark.org/review/8595 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-21Include <sys/param.h> to get MAXPATHLEN.Guy Harris1-0/+1
Change-Id: Ibf40b75eb224262c4d5a571e56e2575bca787b91 Reviewed-on: https://code.wireshark.org/review/8565 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-21Remove trailing whitespace.Guy Harris1-1/+1
Change-Id: Ibc6620f489ae5d956b03ee61dc6f08dfc0a93371 Reviewed-on: https://code.wireshark.org/review/8562 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 29aeea744dc9485ee045de075f7e96564223a4bb) Reviewed-on: https://code.wireshark.org/review/8563
2015-05-21Don't just blindly tell application X11 to do anything.Guy Harris1-43/+140
Determine what type of X11 (bundled from Apple, unbundled XQuartz) we should have and what type we do have. If we don't have any installed, don't tell X11 to do anything, as that just pops up a "where is X11?" dialog; that's information the user shouldn't need to tell the system if it is installed, and it's information for which the user shouldn't be asked if it's not installed - and if they're asked, they might answer incorrectly, leaving a system that doesn't properly launch X11 for Wireshark. (See various ask.wireshark.org questions about this, for example.) Pick up some changes from newer versions of Inkscape, such as using unsigned char *, not using FSSpecs, and adding some comments, while we're at it. Change-Id: Ic9a2b25938c4eec5628d1c16c7db28aa0714203e Reviewed-on: https://code.wireshark.org/review/8559 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04Tell the loader where to find our libraries if we're being installedJeff Morriss1-5/+14
someplace other than /usr . Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c Reviewed-on: https://code.wireshark.org/review/5604 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-03Don't run gtk-update-icon-cache when uninstalling the Qt package. But do runJeff Morriss1-1/+5
it when installing the gnome package. Conflicts: packaging/rpm/SPECS/wireshark.spec.in Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87 Reviewed-on: https://code.wireshark.org/review/5598 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit 7ef5abc818702a4699db39d183eb680bc3947eb4) Reviewed-on: https://code.wireshark.org/review/5601
2014-10-22NSIS: Start winding down the Wireshark 2 Preview.Gerald Combs3-56/+69
Users wishing to try the Qt UI should use the 1.99.x installers. Change-Id: I97bbd049a8da1db63429d236b8afb33ab05ce8f7 Reviewed-on: https://code.wireshark.org/review/4914 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-14Use a wildcard to exclude all Wireshark (GUI) binaries: rpmbuild in RHEL6Jeff Morriss1-4/+2
errors out if you %exclude a file that's not there. Fixes the issue reported by Chris on the -dev list. Change-Id: If8d8b6a9ee69c3d94756b729a809f3c04fc2517f Reviewed-on: https://code.wireshark.org/review/3586 Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com> (cherry picked from commit a83f67cb85926e42314d25f7ddbbd66dbae5b6ed) Reviewed-on: https://code.wireshark.org/review/3590 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-12NSIS: check Windows version before running uninstallerPascal Quantin1-38/+38
Change-Id: Icc8d725bff484c48d14e0a9208c545ca512a9768 Reviewed-on: https://code.wireshark.org/review/3533 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> Petri-Dish: Christopher Maynard <Christopher.Maynard@gtech.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit ddada16e68c185087d526aba8dbb1296fff974c0) Reviewed-on: https://code.wireshark.org/review/3555
2014-08-05Fix some dates in the changelog; add some recent changes to the changelog.Jeff Morriss1-4/+18
Apparently rpmbuild now verifies the dates (including the day of the week) you entered. Change-Id: I1c67fb3170de3199b5fe5f8c117eaefb4d4d28c7 Reviewed-on: https://code.wireshark.org/review/3442 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit b76e0f71aa9b9a4c2ff1242332d1919748e25bc3) Reviewed-on: https://code.wireshark.org/review/3443
2014-08-05Remove the old wireshark binary during RPM upgrades.Jeff Morriss1-1/+7
If we have a pre-alternatives wireshark binary out there (e.g., because we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it in the %pre script. Otherwise the binary gets left there (because it's listed as a %ghost in the new spec file). Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e Reviewed-on: https://code.wireshark.org/review/3332 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit c93297c750b99ac487f1f787896959ca43f64c72) Reviewed-on: https://code.wireshark.org/review/3440
2014-08-04Fix RPM builds with a prefix other than /usr.Jeff Morriss1-8/+8
The location of update-alternatives does not depend on Wireshark's installation prefix: it's always in /usr/sbin/. Change-Id: I7dda9cebec83bc64133adfeb5ee6af70dc6dc7ab Reviewed-on: https://code.wireshark.org/review/3413 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit 644b2e7c69c5289b8a6f524aef84eb7c54cf6058) Reviewed-on: https://code.wireshark.org/review/3414
2014-07-01Get rid of rpath when we're building RPMs.Jeff Morriss1-0/+6
Fedora prohibits it, we don't need it, and it gets in the way some times. Change-Id: I92cee959f471866ff90efe9f96e4fa519c357dd9 Reviewed-on: https://code.wireshark.org/review/2763 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit a4a624e4c5f16ad75ab9124e390f82efaca06512) Reviewed-on: https://code.wireshark.org/review/2765
2014-07-01Fix buildroot.Jeff Morriss1-2/+3
Change-Id: I902db6c69ae5966da1102e4fbcfd9f46867c0b4f Reviewed-on: https://code.wireshark.org/review/2762 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> (cherry picked from commit 5f682f1f0329d65edbb363d7db1df23840d38d83) Reviewed-on: https://code.wireshark.org/review/2764
2014-06-24Add quotes around MAKEDIR. Ben Burwell1-1/+1
Bug: 7870 Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 Reviewed-on: https://code.wireshark.org/review/2620 Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 830d1b1ce9905e287386c9e8bc638c26380d77cb) Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352 Reviewed-on: https://code.wireshark.org/review/2636 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-17When building an OS X package for GTK+, put the libraries in lib.Guy Harris1-5/+10
This reverts to the way we did it prior to the switch to Qt; with GTK+, Contents/MacOS/Wireshark is just a launcher, and the Wireshark binary is in Contents/Resources/bin/wireshark-bin, and the appropriate rpath entry would be @executable_path/../lib - @executable_path/../Frameworks, which works for the Qt version, in which Contents/MacOS/Wireshark is the actual executable, doesn't work for the GTK+ version. This should fix bug 10185. Change-Id: I4e50a4ead8f29a742c97a9001c821aabe1fa5e65 Reviewed-on: https://code.wireshark.org/review/2347 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 93b5a313ada6684c7706da7a578f7787344d6144) Reviewed-on: https://code.wireshark.org/review/2348
2014-06-08Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin2-4/+12
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> (cherry picked from ad7b5381ac54567217f12ee729c7be6cd2848d0f) Change-Id: I3f67b80e984e187ed65c0997fcd02ae3d715995b Reviewed-on: https://code.wireshark.org/review/2021 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-07Only nuke the startup item once we've installed the launch daemon.Guy Harris1-2/+2
That way, if we crash in the middle, there's still something installed that will try to set the permissions on the BPF devices. Change-Id: Ie0c32f9eaca08bdbb359d07e47f20c664bc66411 Reviewed-on: https://code.wireshark.org/review/2023 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 39ca18d71b85d0b99c0fd3c5edab48fa217d7d34) Reviewed-on: https://code.wireshark.org/review/2024
2014-06-07When installing the launch daemon, get rid of the old startup item.Guy Harris1-0/+2
Only one is necessary; get rid of the startup item. Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit b319a67bfb23a93a7f15076a94be3fe6adb9983d) Reviewed-on: https://code.wireshark.org/review/2017
2014-06-06Try to fix OS X GTK+ app creation.Gerald Combs1-3/+5
Change-Id: I81683968ee68da4826dd703bd38c233a72b2083d Reviewed-on: https://code.wireshark.org/review/2006 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-06Switch to a launch daemon for ChmodBPF.Guy Harris10-130/+94
"Ah finally blew that varmint to Kingdom Come!" Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 Reviewed-on: https://code.wireshark.org/review/2004 Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 2b2fbff2dc2af6f47edda62cedd22b22d6c9d9e0) Reviewed-on: https://code.wireshark.org/review/2005
2014-06-05Windows packaging and release note updates.Gerald Combs3-38/+44
Use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)" and "Wireshark (Qt)" respectively in the Windows installer. Shorten the descriptions of the command line tools. Warn against (but don't prohibit) installing on XP. Note that XP is deprecated and that 32-bit OS X and U3 are no longer supported. Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803 Reviewed-on: https://code.wireshark.org/review/1988 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-16Build with GTK+ 2.24.23.Gerald Combs2-0/+21
Change-Id: Ic5c385c0fcef4d40a8cb9e7a271d14eb80905460 Reviewed-on: https://code.wireshark.org/review/1665 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-05-01Remove 'include win32.mak' from certain nmake files when not needed.Bill Meier2-2/+0
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 Reviewed-on: https://code.wireshark.org/review/1460 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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