osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
53,479 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

125 Commits

Author SHA1 Message Date
Stig Bjørlykke fae6b0b573 Add missing --git-dir=$srcdir/.git for ls-remote 
Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92
Reviewed-on: https://code.wireshark.org/review/2231
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
 2014-06-15 17:41:10 +00:00
Gerald Combs a6993d3806 Fix package version stamping. 
Change-Id: I1615364071563c4f56b071d7d68e4660dd989296
Reviewed-on: https://code.wireshark.org/review/2198
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit fd017eeae358fbcbb3f51f2765bd31777aa513d1)
Reviewed-on: https://code.wireshark.org/review/2201
 2014-06-13 20:20:57 +00:00
Jeff Morriss 4dfbb792c8 From Gisle Vanem on -dev: don't print modelines info when run with -h. 
Also remove trailing white space.

Change-Id: Ic56140f617a2cbf9fa93fb427282eab0b6cff9c6
Reviewed-on: https://code.wireshark.org/review/2113
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-06-12 23:56:00 +00:00
Gerald Combs 285405a0d7 1.11.4 → 1.99.0. 
Change-Id: I5b0f713fdbc63e78f4f52177317c0e536aca3044
Reviewed-on: https://code.wireshark.org/review/1761
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-05-23 20:57:42 +00:00
Gerald Combs d73d1f14b3 1.11.3 → 1.11.4. 
Change-Id: I0bf8792b9b524ae4d8e1022b234e2510972c7019
Reviewed-on: https://code.wireshark.org/review/1154
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-04-15 17:29:19 +00:00
Gerald Combs 1dd5d3a6aa Build 1.11.3. 
Change-Id: I8c8f1c22a2cba97e69b27e5fb0b4de9981668966
Reviewed-on: https://code.wireshark.org/review/1153
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-04-15 16:37:19 +00:00
Gerald Combs dacc7eea39 Pull in some changes from master-1.10/make-version.pl. 
Matches versioning behavior in stable branches.

Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239
Reviewed-on: https://code.wireshark.org/review/1124
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-04-14 17:15:01 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file 
(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-31 18:48:06 +00:00
Gerald Combs 8d7b6001bb "origin" appears to be a safer bet than "@{upstream}". 
Change-Id: Icd00c62d9b908771bf2b73b8e5b49d519570ff8b
Reviewed-on: https://code.wireshark.org/review/142
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-02-08 00:47:01 +00:00
Gerald Combs f966980937 Replace "svn" with "git" all over the place. 
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.

Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2014-02-07 23:03:03 +00:00
didier 60ea64531f use the right src dir in git command for svnversion.h 
make-version.pl wasn't using the right source dir for git commands when not compiling from inside source tree.
add --git-dir=$srcdir/.git parameter.

Change-Id: I45ca4874d96abaed1c559c022d0ace66239652c8
Reviewed-on: https://code.wireshark.org/review/122
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-05 22:27:16 +00:00
Gerald Combs 82c5bfd6f1 We have a usable tag now. There's no need to fake a version number. 
Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
 2014-01-29 11:53:04 -08:00
Gerald Combs 04b18f44c1 Make it more clear that we're faking a git description for now. 
svn path=/trunk/; revision=54810
 2014-01-15 00:52:27 +00:00
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