osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
41,834 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

587 Commits

Author SHA1 Message Date
Gerald Combs 4507b5ed3a Remove a hard-coded path. 
svn path=/trunk/; revision=44085
 2012-07-27 23:30:44 +00:00
Gerald Combs f25ae3613a Fix the dependencies for wireshark.exe and tshark.exe and use "xcopy 
/d" instead of "copy" in Makefile.nmake. Fix the uninstall.exe path in
packaging\nsis\Makefile.nmake. This keeps us from clobbering existing
files in wireshark-gt2 unnecessarily.

svn path=/trunk/; revision=43976
 2012-07-24 23:59:42 +00:00
Gerald Combs 8d050c2828 Remove uninstall_installer.exe when we're done with it so that we don't 
have an extraneous executable in the staging directory.

svn path=/trunk/; revision=43965
 2012-07-24 16:30:03 +00:00
Gerald Combs 69b1c2dd84 Add a comment. 
svn path=/trunk/; revision=43866
 2012-07-20 18:04:00 +00:00
Gerald Combs 6b04299ae4 According to 
http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx

and bug 7507 the Visual C++ 2010 redistributable installer might want
to reboot the system. Tell it not to do that and request a reboot at
the end of the installation process if needed.

svn path=/trunk/; revision=43864
 2012-07-20 17:56:16 +00:00
Michael Mann 1ec2f43f2c WiMAX OFDMA PHY SAP dissector plugin (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2695) 
svn path=/trunk/; revision=43844
 2012-07-20 01:21:27 +00:00
Anders Broman 78527f225d Make it possible to add custom/private MIBs to the Windows installer. 
svn path=/trunk/; revision=43819
 2012-07-19 08:02:50 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Gerald Combs 1785ed1ee0 Try to fix tarball compilation on Windows. 
svn path=/trunk/; revision=43428
 2012-06-21 17:35:59 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page. 
svn path=/trunk/; revision=43377
 2012-06-19 17:32:49 +00:00
Anders Broman 2592e50101 Don't install main-menubar-ui.xml 
svn path=/trunk/; revision=43368
 2012-06-19 14:54:11 +00:00
Gerald Combs 089a048d4d Add back an absolute path prefix. 
svn path=/trunk/; revision=43264
 2012-06-14 19:49:57 +00:00
Gerald Combs 7931a2baf6 More NSIS cleanup. 
svn path=/trunk/; revision=43261
 2012-06-14 18:53:55 +00:00
Gerald Combs f6e2b64a8f Fix things to match what we're doing in our portableapps counterpart. 
svn path=/trunk/; revision=43246
 2012-06-13 23:04:57 +00:00
Gerald Combs b5e5d6ac35 Don't add uninstall.exe to the U3/PortableApps manifest. Define 
STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
 2012-06-13 22:28:28 +00:00
Gerald Combs bcb021c25f Define STAGING_DIR and use it in various places instead of hard-coding 
"..\.." or "..\..\wireshark-gtk2".

svn path=/trunk/; revision=43239
 2012-06-13 21:03:54 +00:00
Gerald Combs c548b1097f Use terminology that conforms better with the MSDN documentation and a 
style that conforms better with the rest of the NSIS output.

svn path=/trunk/; revision=43237
 2012-06-13 20:11:41 +00:00
Gerald Combs a9cb4061d4 Move the "uninstall" parts of wireshark.nsi to uninstall.nsi and the 
common parts to common.nsh. Creating an installer now requires two
NSIS runs:

  - uninstaller.nsi, which creates an installer (uninstall_installer.exe)
    that only writes uninstall.exe to ../../wireshark-gtk2.

  - wireshark.nsi, which bundles uninstall.exe along with the rest of
    our installation files.

If we ever get around to signing our executables this will let us sign
all of them. It also cleans up the .nsi file contents a bit.

Instead of keeping separate list of file extensions, manage them from
a single macro. Print the extensions we register / deregister in the
detail pane.

svn path=/trunk/; revision=43236
 2012-06-13 19:06:27 +00:00
Pascal Quantin 3be09ce941 Add TGPPS9.xml to makefile and NSIS installer 
svn path=/trunk/; revision=43202
 2012-06-11 13:48:11 +00:00
Guy Harris b018e77f7b No more GIOP plugins, no more GIOP loadable DLL. 
svn path=/trunk/; revision=42981
 2012-06-01 17:11:00 +00:00
Anders Broman 9d6d0cf275 Replace IDL generated dissector with common dll 
svn path=/trunk/; revision=42926
 2012-05-30 19:03:56 +00:00
Gerald Combs 43670460ff Use GeoIP 1.4.8 which includes a DLL instead of a static library. 
svn path=/trunk/; revision=42905
 2012-05-29 23:31:00 +00:00
Gerald Combs 992587c3bf Try using an OBS-derived Gtk2 bundle, second try. 
svn path=/trunk/; revision=42623
 2012-05-14 17:54:47 +00:00
Guy Harris ed15123049 Add .ntar as a suffix (some pcap-ng files use it). 
Sort the suffixes alphabetically.

svn path=/trunk/; revision=42329
 2012-04-29 02:38:55 +00:00
Guy Harris c492f45a1e Make the extension lower case. 
Say "Pcap" rather than "Libpcap" - pcap format is used by WinPcap as
well (and it's also read and written by this library called Wiretap
:-)).

Add an additional entry for pcap-NG.

svn path=/trunk/; revision=42328
 2012-04-29 02:27:08 +00:00
Gerald Combs 733834afdb Switch back to the gtk.org version of the GTK+ bundle since its Cairo 
doesn't crash.

svn path=/trunk/; revision=42171
 2012-04-20 23:41:36 +00:00
Gerald Combs d8389b5429 Switch to our custom GTK+ bundles derived from openSUSE Build Service 
packages. Sort and normalize our DLL lists. Add several new required DLLs.

svn path=/trunk/; revision=42143
 2012-04-19 18:31:11 +00:00
Gerald Combs 16a4af2d67 Add and update a bunch of Programs and Features-related registry 
keys. Sort the keys by name. Calculate the installation size after all
of the files have been installed and add that in the "EstimatedSize"
key. Fix the display icon. Add a hint about our target platform. Add
version information.

We now look like a grown-up application in the Programs and Features
control panel.

svn path=/trunk/; revision=41914
 2012-04-04 00:47:21 +00:00
Gerald Combs 0ef57966fc Update a couple of keys. 
svn path=/trunk/; revision=41832
 2012-03-29 20:22:50 +00:00
Guy Harris b7cfa1359d Now, isn't that swell! Leopard's dseditgroup doesn't return a failure 
exit status if the group in question doesn't exist, so we can't use
dseditgroup on Leopard to check whether the access_bpf group exists.

Instead, as per Martin Williams' suggestion in bug 6526, use "dscl .
-read /groups/{group}" instead; the suggestion came from the addgroup.sh
script in

	https://developer.apple.com/library/mac/documentation/OpenSource/Conceptual/ShellScripting/ShellScripting.pdf

svn path=/trunk/; revision=41680
 2012-03-20 04:06:36 +00:00
Gerald Combs 98080036b6 Capitalize "Wireshark" in various package names. 
svn path=/trunk/; revision=41621
 2012-03-16 17:36:40 +00:00
Guy Harris fe37c0ccb8 Add @configure_input@ to a bunch of .in files that didn't have it. 
Add $Id$ to those of said files that didn't have it, and fix one $Id to
be $Id$.

svn path=/trunk/; revision=41594
 2012-03-16 03:39:51 +00:00
Alexis La Goutte d23c469785 Rename the Xylan dictionnary to Alcatel-Lucent Xylan dictionnary 
Alcatel (now Alcatel-Lucent) buy Xylan in 1999...
And now Attributs RADIUS is used in Alcatel-Lucent Omniswitch Product.

svn path=/trunk/; revision=41474
 2012-03-10 18:30:20 +00:00
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while.... 
svn path=/trunk/; revision=41180
 2012-02-24 16:23:38 +00:00
Jeff Morriss 149f655c58 As suggested on the -dev list today, add Wireshark_package.pmdoc to the source 
distribution.

To do this, however, requires renaming that directory because automake can't
handle files with spaces in their names.

svn path=/trunk/; revision=41040
 2012-02-16 16:31:09 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk. 
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
 2012-01-15 21:59:11 +00:00
Stig Bjørlykke 92528dad84 Happy New Year! 
svn path=/trunk/; revision=40353
 2012-01-01 10:02:11 +00:00
Gerald Combs 1fc129282b Remove some NSIS 1.x cruft. 
svn path=/trunk/; revision=40318
 2011-12-28 22:42:40 +00:00
Gerald Combs 5ce69a0445 Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2 
directory.  This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.

svn path=/trunk/; revision=40317
 2011-12-28 22:37:38 +00:00
Bill Meier 02c8228bd2 Add svn:executable to props 
svn path=/trunk/; revision=39858
 2011-11-15 17:44:14 +00:00
Guy Harris 475b93f975 Requiescat in pace, osx-build.sh. 
svn path=/trunk/; revision=39714
 2011-11-02 18:01:27 +00:00
Gerald Combs 376c998cff Remove osx-build.sh. It was never fully ported to the Wireshark build 
environment and has been unused for 3 years.

svn path=/trunk/; revision=39713
 2011-11-02 17:36:20 +00:00
Anders Broman 5198e05412 Remove the obsolete files fom the installer 
svn path=/trunk/; revision=38816
 2011-08-31 10:25:57 +00:00
Guy Harris c85d377856 I guess this is the right thing to do with the "ui" directory to put it 
into the U3 package.

svn path=/trunk/; revision=38764
 2011-08-28 19:28:17 +00:00
Anders Broman a08c67c558 Add the main menubar UI description. 
svn path=/trunk/; revision=38762
 2011-08-28 18:34:52 +00:00
Anders Broman 3b203417d5 Add the treeView popup UI description. 
svn path=/trunk/; revision=38760
 2011-08-28 16:18:58 +00:00
Anders Broman 65c3879f2d Install the GUI xml files. I'm not sure about the Makefile.am changes pkease check. 
svn path=/trunk/; revision=38756
 2011-08-28 15:08:31 +00:00
Gerald Combs 5520a452b5 The MSDN page for ZeroMemory recommends using SecureZeroMemory instead, 
so do so. Add ZeroMemory to checkAPIs.pl.

svn path=/trunk/; revision=38584
 2011-08-17 16:54:24 +00:00
Gerald Combs 17351102dd Add some distclean / clean targets. 
svn path=/trunk/; revision=38457
 2011-08-10 20:02:31 +00:00
Chris Maynard 716766aa27 Add a cast to avoid "conversion from size_t to int, possible loss of data" warning found when attempting to create the U3 package on Windows 7-x64. Hmm, why doesn't the Window 7-x64 buildbot build U3 or portableapps packages? 
svn path=/trunk/; revision=38237
 2011-07-28 12:28:06 +00:00