osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
60815 commits 23 branches 0 tags 1.3 GiB
Commit graph

162 commits

Author SHA1 Message Date
Gerald Combs
d7e93e99c7 Copy over recent changes from trunk-1.8 along with some local 
modifications.

  ------------------------------------------------------------------------
  r54807 | gerald | 2014-01-14 16:35:34 -0800 (Tue, 14 Jan 2014) | 2 lines

  Start using the output of 'git describe'.
  ------------------------------------------------------------------------
  r54805 | gerald | 2014-01-14 15:38:16 -0800 (Tue, 14 Jan 2014) | 2 lines

  Start adding support for plain git.
  ------------------------------------------------------------------------

svn path=/trunk/; revision=54809
 2014-01-15 00:51:38 +00:00
Michael Mann
bf284da2ee TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) 
This is a VERY PRELIMINARY version of tfshark.  It's an attempt to jumpstart FileShark and its architecture.  Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it)

This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture.  And those layers will slowly be added in time (patches always welcome!).

svn path=/trunk/; revision=54646
 2014-01-08 04:35:28 +00:00
Gerald Combs
16e27047d0 1.11.2 → 1.11.3. 
svn path=/trunk/; revision=53412
 2013-11-18 17:41:00 +00:00
Gerald Combs
5033435add Build 1.11.2. 
svn path=/trunk/; revision=53411
 2013-11-18 16:44:16 +00:00
Gerald Combs
f772a268db 1.11.1 → 1.11.2. 
svn path=/trunk/; revision=53346
 2013-11-15 22:34:31 +00:00
Gerald Combs
d3033d3ab8 Build 1.11.1. 
svn path=/trunk/; revision=53344
 2013-11-15 20:45:13 +00:00
Gerald Combs
6fcea10d50 1.11.0 → 1.11.1. 
svn path=/trunk/; revision=52629
 2013-10-15 19:21:04 +00:00
Gerald Combs
b4f3f2ffd6 Try building 1.11.0. 
svn path=/trunk/; revision=52628
 2013-10-15 18:40:00 +00:00
Jörg Mayer
29f0303517 svn version 1.7.11 no longer has local .svn directories, 
just one at the top level. So on my system, /trunk no longer
contains a .svn directory. Check in parent directory as well.

svn path=/trunk/; revision=51566
 2013-08-28 18:27:16 +00:00
Gerald Combs
ea19c7f952 1.9.3 → 1.11.0. 
svn path=/trunk/; revision=48972
 2013-04-22 17:59:38 +00:00
Gerald Combs
b60e41b984 1.9.2 → 1.9.3. 
svn path=/trunk/; revision=48627
 2013-03-28 18:13:22 +00:00
Gerald Combs
ffbcd0705e Build 1.9.2. 
svn path=/trunk/; revision=48625
 2013-03-28 17:48:31 +00:00
Gerald Combs
6bc16a77b0 Add a wireshark-version:[] replacement and --sort-and-group-- block 
definition to asciidoc.conf. Add support for asciidoc.conf to
make-version.pl. Set some SVN keywords.

Fill in the new protocol list.

svn path=/trunk/; revision=48405
 2013-03-18 22:17:42 +00:00
Gerald Combs
ed45af6e36 1.9.1 → 1.9.2. 
svn path=/trunk/; revision=48271
 2013-03-12 21:36:13 +00:00
Gerald Combs
6170c8506f Build 1.9.1. 
svn path=/trunk/; revision=48270
 2013-03-12 21:05:23 +00:00
Gerald Combs
7df948dd4a 1.9.0 → 1.9.1. 
svn path=/trunk/; revision=47771
 2013-02-20 16:42:34 +00:00
Gerald Combs
3e0d6732cc Build 1.9.0. 
svn path=/trunk/; revision=47770
 2013-02-20 16:36:47 +00:00
Gerald Combs
f8002de6a4 If we're using git, try pulling the SVN revision out of the commit body. 
svn path=/trunk/; revision=47619
 2013-02-10 22:20:31 +00:00
Gerald Combs
196dbce3d2 Add back extra packaging information if it's present. 
svn path=/trunk/; revision=45112
 2012-09-24 21:57:52 +00:00
Gerald Combs
52746c60a0 Update configure.ac modifications to reflect r44986. 
svn path=/trunk/; revision=44990
 2012-09-18 22:14:12 +00:00
Evan Huus
37f0380998 Add support for bzr checkouts (similar to git checkouts) to make-version.pl. 
Also, add modelines.

svn path=/trunk/; revision=44920
 2012-09-15 16:09:07 +00:00
Alexis La Goutte
8f4a2e5f28 Update svnversion.h with (short) SHA-1 commit id and branch when use git repository 
svn path=/trunk/; revision=44850
 2012-09-10 16:00:58 +00:00
Jörg Mayer
fcb0307fae The name configure.in has been deprecated for many years. 
Use configure.ac instead.

svn path=/trunk/; revision=44630
 2012-08-23 11:11:24 +00:00
Gerald Combs
77883a8668 Don't clobber PACKAGE_URL or PACKAGE_BUGREPORT. 
svn path=/trunk/; revision=44523
 2012-08-15 17:31:48 +00:00
Gerald Combs
f1cf70fc10 1.7.2 → 1.9.0. 
svn path=/trunk/; revision=43120
 2012-06-05 16:21:47 +00:00
Gerald Combs
e5cd6c087e 1.7.1 → 1.7.2. 
svn path=/trunk/; revision=41971
 2012-04-06 17:27:20 +00:00
Gerald Combs
b20527cb7f Build 1.7.1. 
svn path=/trunk/; revision=41970
 2012-04-06 16:28:33 +00:00
Jakub Zawadzki
12c1667881 For some broken environments we need also set LC_ALL. 
svn path=/trunk/; revision=41957
 2012-04-05 17:36:32 +00:00
Gerald Combs
4defd2a34e Copy over updates from the 1.6 branch. 
svn path=/trunk/; revision=40437
 2012-01-11 17:03:54 +00:00
Gerald Combs
c95e2e88ce Try to preserve native line endings when we rewrite files. 
svn path=/trunk/; revision=39938
 2011-11-18 16:51:40 +00:00
Gerald Combs
d7bb2160f6 Use the source directory argument. 
svn path=/trunk/; revision=39926
 2011-11-18 01:35:58 +00:00
Gerald Combs
873e0bdd71 Maybe it's not a good idea to modify configure.in or config.nmake during 
compilation. Add a "--set-svn" option which only affects svnversion.h and
make it the default behavior.

svn path=/trunk/; revision=39923
 2011-11-18 01:17:31 +00:00
Gerald Combs
f6603bc947 Don't clobber release information in configure.in. 
svn path=/trunk/; revision=39921
 2011-11-18 00:33:14 +00:00
Gerald Combs
a8cc73a4e5 Update some comments. 
svn path=/trunk/; revision=39913
 2011-11-17 20:09:07 +00:00
Gerald Combs
b17a3c7c75 Make sure we terminate WiresharkCurrentVersion so we won't have to 
reapply r39907.

svn path=/trunk/; revision=39908
 2011-11-17 17:15:51 +00:00
Gerald Combs
3a2b8d4425 Don't clobber release information for now. 
svn path=/trunk/; revision=39893
 2011-11-17 01:37:14 +00:00
Gerald Combs
5624924e4a Create/update svnversion.h unless we're only running with --get-*. 
svn path=/trunk/; revision=39892
 2011-11-17 00:48:21 +00:00
Gerald Combs
3f12c48ace Add an SVN_REVISION variable to config.nmake. This can be used to 
retrieve our SVN revision in releases.

Use make-version.pl to set all version information. Be more explicit
about the tasks it performs:

  - Fetching the SVN revision which corresponds to our code. The
    revision can be fetched via "svn info", "git svn info", SubWCRev",
    config.nmake, or by prodding .svn.

  - Setting the version numbers (the "major.minor.micro" triplet).

  - Setting the release information (revision/build number, local build
    identifier)

Remove the "is_release" configuration option and dist-hook target.

When run with a "--set-*" option or no options make sure we leave a
valid svnversion.h behind.


svn path=/trunk/; revision=39891
 2011-11-17 00:19:03 +00:00
Anders Broman
f8467706ac From Michael Mann: 
Make it possible to use TortoiseSVN's SubWCRev.exe to update svnversion.h

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5441

svn path=/trunk/; revision=39842
 2011-11-15 07:12:19 +00:00
Gerald Combs
2798ad267a 1.7.0 → 1.7.1. 
svn path=/trunk/; revision=39769
 2011-11-08 22:35:56 +00:00
Gerald Combs
4fe9563e74 Build 1.7.0. 
svn path=/trunk/; revision=39768
 2011-11-08 20:02:06 +00:00
Jeff Morriss
14ab9387c1 Revert rev 38340 (which was itself a reversion of 34807): if we can't find the 
SVN version, indicate that the SVN version is unknown.  This puts back the fix
for bug 1413.

Add a new version.conf option for make-version which tell is "this is a build
from a release tarball."  When that option is present do not try to use SVN
to determine the SVN version, just use whatever SVN information shipped in the
tarball.

If version.conf is present in the source tree (as it is only in the release
branches), deliver it in the source tarball but only after setting the "this
is a release tarball" option.


All of this means that that builds from release-branch tarballs will report
the SVN version of the release tarball rather than "unknown."  This addresses
the issue reported in
http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown

Builds from trunk (including the source tarballs) will continue to report that
the SVN version is unknown.  (Maybe that, too, should be changed?)

svn path=/trunk/; revision=38933
 2011-09-08 01:53:41 +00:00
Stig Bjørlykke
603d7b9cf1 Fetch svn revision using git-svn also when building out-of-tree. 
svn path=/trunk/; revision=38875
 2011-09-03 14:21:07 +00:00
Chris Maynard
78ef4cdd88 Don't report svn version if not building from svn. Change prompted by http://ask.wireshark.org/questions/5376/wireshark-161-title-shows-svn-rev-unknown-from-unknown. 
svn path=/trunk/; revision=38340
 2011-08-04 20:20:51 +00:00
Stig Bjørlykke
7bd8379896 Fetch svn revision also when checked out with git-svn. 
svn path=/trunk/; revision=37895
 2011-07-04 21:14:43 +00:00
Gerald Combs
d7d45f8072 1.5.1 → 1.5.2. Reenable Babel. 
svn path=/trunk/; revision=36540
 2011-04-10 17:03:43 +00:00
Gerald Combs
8b8082442d Build 1.5.1. Temporarily disable the Babel dissector. 
svn path=/trunk/; revision=36537
 2011-04-10 16:42:10 +00:00
Gerald Combs
1635ef0ddf 1.5.0 → 1.5.1. 
svn path=/trunk/; revision=35639
 2011-01-24 19:27:38 +00:00
Gerald Combs
ee8a2da6a9 Build 1.5.0. 
svn path=/trunk/; revision=35637
 2011-01-24 18:37:24 +00:00
Chris Maynard
ad78dfe2c0 If svn not found, print "Unknown" revision message. 
svn path=/trunk/; revision=34807
 2010-11-08 17:10:35 +00:00
Gerald Combs
e535271512 1.3.5 -> 1.3.6. 
svn path=/trunk/; revision=32667
 2010-05-05 00:28:24 +00:00
Gerald Combs
cfa07ad505 Build 1.3.5. 
svn path=/trunk/; revision=32666
 2010-05-04 23:03:42 +00:00
Gerald Combs
ab71d9d92b 1.3.4 -> 1.3.5. 
svn path=/trunk/; revision=32345
 2010-03-31 22:54:07 +00:00
Gerald Combs
5968d5220a Build 1.3.4. 
svn path=/trunk/; revision=32340
 2010-03-31 16:29:45 +00:00
Gerald Combs
7e9faae9d9 1.3.3 -> 1.3.4. 
svn path=/trunk/; revision=31865
 2010-02-11 16:38:42 +00:00
Gerald Combs
71913d2700 Build 1.3.3. 
svn path=/trunk/; revision=31860
 2010-02-10 22:53:43 +00:00
Stig Bjørlykke
229d8368bc Set correct locale in make-version.pl instead of in Makefiles. 
Added back add_custom_command for svnversion.h.
Removed unnecessary text2pcap_CLEAN_FILES.
Fix indent for ps.c command.

svn path=/trunk/; revision=31525
 2010-01-14 15:43:33 +00:00
Stig Bjørlykke
a33f717f89 Compare both lines in svnversion.h when checking for update needed. 
svn path=/trunk/; revision=31454
 2010-01-06 12:24:38 +00:00
Gerald Combs
f08e18e9a5 Switch back to normal versioning. Bump the version to 1.3.3. 
svn path=/trunk/; revision=31064
 2009-11-24 05:57:05 +00:00
Gerald Combs
2076b90455 Build 1.3.2. 
svn path=/trunk/; revision=31063
 2009-11-24 05:53:36 +00:00
Gerald Combs
bcebc020ed Switch back to normal versioning. 
svn path=/trunk/; revision=30733
 2009-10-27 19:36:31 +00:00
Gerald Combs
ef952d025f Build 1.3.1. 
svn path=/trunk/; revision=30724
 2009-10-27 00:10:52 +00:00
Gerald Combs
5836a7975f Switch back to normal versioning. 
svn path=/trunk/; revision=29923
 2009-09-15 15:46:44 +00:00
Gerald Combs
c7b0b40c9b Build 1.3.0. 
svn path=/trunk/; revision=29912
 2009-09-14 23:31:02 +00:00
Gerald Combs
d574a2450b Don't exit with an error if we can't find the svn executable. 
svn path=/trunk/; revision=29288
 2009-08-04 00:35:30 +00:00
Gerald Combs
1e93d53b56 Use "svn info" to fetch the version by default. Fetch the repository path as 
well. Add the repository path to the version strings.

svn path=/trunk/; revision=29171
 2009-07-22 23:59:15 +00:00
Gerald Combs
1c3e3a4a53 Switch back to 1.1.4. 
svn path=/trunk/; revision=27810
 2009-03-20 23:15:15 +00:00
Gerald Combs
ecd732384c Temporarily switch back to building 1.1.3 final. 
svn path=/trunk/; revision=27807
 2009-03-20 16:17:02 +00:00
Gerald Combs
2d24475011 Move to 1.1.4. 
svn path=/trunk/; revision=27767
 2009-03-18 05:42:03 +00:00
Gerald Combs
86ea84d2e4 Build 1.1.3. 
svn path=/trunk/; revision=27765
 2009-03-17 23:26:55 +00:00
Gerald Combs
414d042d2e Change the version to 1.1.3. SVN-stamp the version again. 
svn path=/trunk/; revision=27252
 2009-01-16 22:35:14 +00:00
Gerald Combs
8c6b59cf9c Build 1.1.2. 
svn path=/trunk/; revision=27235
 2009-01-15 01:37:52 +00:00
Jaap Keuter
02654c2b4b Clear up the code. 
svn path=/trunk/; revision=27111
 2008-12-24 16:08:54 +00:00
Gerald Combs
193ad40a59 Switch back to 1.1.2. 
svn path=/trunk/; revision=26392
 2008-10-09 05:07:24 +00:00
Gerald Combs
57a1c7be61 Try for another 1.1.1 development release. 
svn path=/trunk/; revision=26374
 2008-10-07 21:29:25 +00:00
Gerald Combs
2ed9fdf00e Switch back to normal versioning. Bump the development version to 1.1.2. 
svn path=/trunk/; revision=26259
 2008-09-24 03:29:21 +00:00
Gerald Combs
854aa68d8a Build 1.1.1. 
svn path=/trunk/; revision=26256
 2008-09-23 21:05:00 +00:00
Gerald Combs
6ee6bc0460 Make SVN-stamped versions the default again. 
svn path=/trunk/; revision=26171
 2008-09-09 23:57:02 +00:00
Gerald Combs
e953bf064a Fix U3 packaging. Build 1.1.0 again in order to pick up the new GLib/GTK+ 
libraries.

svn path=/trunk/; revision=26168
 2008-09-09 17:16:41 +00:00
Gerald Combs
be3b7d470f Make SVN-stamped versions the default again. 
svn path=/trunk/; revision=26137
 2008-09-04 20:10:22 +00:00
Gerald Combs
56c7f5b643 Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so 
that we can build 1.1.0 packages.

svn path=/trunk/; revision=26136
 2008-09-04 19:37:16 +00:00
Gerald Combs
38d6dc43a4 Fix a logic problem. 
svn path=/trunk/; revision=25592
 2008-06-24 20:54:38 +00:00
Gerald Combs
d5de78acd1 Copy over r25535 from /trunk-1.0: When we're run with -p, set 
VERSION_BUILD no matter what.

svn path=/trunk/; revision=25552
 2008-06-23 21:07:37 +00:00
Gerald Combs
e9a197ee94 Have autoconf generate "ustar" tar files by default. This should let us have 
paths longer than 99 characters.

svn path=/trunk/; revision=25232
 2008-05-05 17:03:22 +00:00
Gerald Combs
7abeb02747 If we have an SVN revision number, use it as the build number under Windows 
instead of "0".

svn path=/trunk/; revision=24376
 2008-02-18 18:08:14 +00:00
Jörg Mayer
48537a7a65 Next try. 
svn path=/trunk/; revision=23749
 2007-12-04 11:00:13 +00:00
Jörg Mayer
6f343baf07 Fix for http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1413 
Print "SVN Rev unknown" in case the svn command was not found.

svn path=/trunk/; revision=23739
 2007-12-04 03:48:05 +00:00
Bill Meier
1d23f6fd83 Handle case of source-dir != build-dir; 2 other minor bug fixes 
svn path=/trunk/; revision=22590
 2007-08-22 19:36:49 +00:00
Gerald Combs
0bd2bdb7a3 Set our package version even if we're using the SVN client. 
svn path=/trunk/; revision=20500
 2007-01-19 06:34:07 +00:00
Jörg Mayer
6a5e231e27 Adapt the svn info hack to work out of the box for people who 
are using svn 1.4 or newer to automatically switch to svn info.

svn path=/trunk/; revision=20343
 2007-01-08 10:36:28 +00:00
Jaap Keuter
e257cd4437 Fix for bug 1195. 
Add preference svn_client to indicate you want to use 'svn info' i.s.o. ugly directory hack.
version.conf format more relaxed.

svn path=/trunk/; revision=20196
 2006-12-22 12:53:49 +00:00
Gerald Combs
28ee885021 Copy over changes from the 0.99.2 branch. 
svn path=/trunk/; revision=18752
 2006-07-17 18:53:40 +00:00
Gerald Combs
8d6c73e567 More ethereal -> wireshark. 
svn path=/trunk/; revision=18292
 2006-05-31 22:34:21 +00:00
Ronnie Sahlberg
89f022b12b name change 
svn path=/trunk/; revision=18197
 2006-05-21 05:12:17 +00:00
Gerald Combs
0d3244a6fe Split the version under Windows into its major, minor, and micro 
components.  Use them to build the VERSION, RC_VERSION, and manifest
versions (the latter two are picky about formatting).  This would
probably be useful on the autoconf side, but I didn't see an obvious
way to implement it.

svn path=/trunk/; revision=17302
 2006-02-14 15:14:41 +00:00
Jörg Mayer
292eb61545 Change SVN version from date to revision 
svn path=/trunk/; revision=16951
 2006-01-05 09:20:08 +00:00
Gerald Combs
dacd1736fa Read .svn/entries directly instead of calling "svn info", as suggested by 
Thomas Anders.  This should make things more locale-independent and remove
a dependency on "svn" being present.

svn path=/trunk/; revision=14620
 2005-06-13 16:31:01 +00:00
Gerald Combs
e7e26224b2 Fix the handling of "enable: 0" in version.conf. 
svn path=/trunk/; revision=13109
 2005-01-18 16:00:57 +00:00
Gerald Combs
a1f2fba1ad If we can't find the "svn" executable in the current path, look in 
"c:/cygwin/lib/subversion/bin/", which is the current default location
for Subversion 1.1.1 under Cygwin.  If we still can't find "svn", simply
return instead of exiting.

svn path=/trunk/; revision=12856
 2004-12-29 15:54:55 +00:00
Gerald Combs
f067af6e5d Remove debugging output. 
svn path=/trunk/; revision=12768
 2004-12-17 20:42:35 +00:00