Update .gitignore to add some Windows specific build stuff to ignore list.

svn path=/trunk/; revision=50231
(cherry picked from commit e66457472d52fc96a1b5d3c30beed4b07f14fe8b)

Change-Id: I41fd7ba5ce96055928d65fb5de4252750692078e
Reviewed-on: https://code.wireshark.org/review/481
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Strip out carriage returns when reading version.conf.

The input record separator ($/) under Cygwin's Perl appears to be "\n"
which means that chomp() won't strip out carriage returns. Make sure
we do that when reading version.conf, otherwise we can end up with
unexpected behavior.

Check pkg_enable using an integer comparison as an extra level of
protection.

(We need to handle CRs better in general but for now we need to get
version stamping working for the next release.)

Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b
Reviewed-on: https://code.wireshark.org/review/483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0)
Reviewed-on: https://code.wireshark.org/review/484
Don't append "-dirty" to the version string.

Change-Id: I755a6229537745eca07f2fc467b9db9e6130b301
Reviewed-on: https://code.wireshark.org/review/485
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 7bb4ec81a7912a785758cd63570dab1d00da2647)
Reviewed-on: https://code.wireshark.org/review/486
More version stamp fixes.

Change-Id: I80601db962734364575c989ecd64983ef5a493a2
Reviewed-on: https://code.wireshark.org/review/487
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Switch to "rc" instead of "pre" to match our tags.

Change-Id: I539b7287cd9d91bc88549d56283beb3f1ab1ff8e
Reviewed-on: https://code.wireshark.org/review/489
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Disable IPv4 checksum verfification to match TCP and UDP.

Offloading seems to be very common nowadays and having this option
enabled by default generates a lot of false positives. Suggested by
Laura Chappell.

Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff
Reviewed-on: https://code.wireshark.org/review/426
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
(cherry picked from commit 104a6edd1fb703c5c2319c893720df86f8c9a9e7)
Reviewed-on: https://code.wireshark.org/review/470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Update the release notes.

Change-Id: Iec747ea0f92142a81a88b6ff92d9dd3ec1818e7e
Reviewed-on: https://code.wireshark.org/review/506
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Backport g97c9a9b from git/master to git/master-1.10

Fix for part 2 of Bug #9834

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

========
    commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430
    Author: Gerald Combs <gerald@wireshark.org>
    Date:   Fri Aug 2 16:34:31 2013 +0000

        Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
        2.7, and 3.3. The contents of packet-ncp2222.c are different after the
        changes (e.g. some array contents are in a different order) but the
        output of running 'tshark -nVxr' on the NCP files in the menagerie are
        identical.

        svn path=/trunk/; revision=51123

Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19
Reviewed-on: https://code.wireshark.org/review/508
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10

Another Fix for part 2 of Bug #9834

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

============
    commit 2336eb9919e20de306b29ab34d1ca12550930f4a
    Author: Gerald Combs <gerald@wireshark.org>
    Date:   Fri Aug 2 00:22:51 2013 +0000

        Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
        2.7, and 3.3.

        svn path=/trunk/; revision=51106
        /tools/make-tap-reg.py

Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211
Reviewed-on: https://code.wireshark.org/review/509
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Fix 2 instances of "Warning: Extended value string ... forced to fall back to linear search".

 Note: This issue was fixed in dev Wireshark as part of a much more extensive set
       of changes.

Change-Id: Iadca7e7813f42029e62c922ed183b6535a9c2a77
Reviewed-on: https://code.wireshark.org/review/510
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Fix some cases of value_string_ext without BASE_EXT_STRING.

This fixes bug 9834.

Change-Id: Ida6034fd4149b647545ed314eb10819e71553f85
Reviewed-on: https://code.wireshark.org/review/512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Fix another case of a missing BASE_EXT_STRING (which may cause a crash).

Change-Id: Ibe690826747b47d8b9a5e93f1ad3e96f2f18e7ef
Reviewed-on: https://code.wireshark.org/review/514
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Add CVE IDs.

Change-Id: Iff81dd013812e79d4c70018cae48b3c16495a3af
Reviewed-on: https://code.wireshark.org/review/523
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a check for an oversized record.

For now we declare the file corrupt and give up. We may want to handle
this more gracefully. Fixes a vulnerability discovered by Wesley Neelen
(bug 9843).

Remove the RCS ID and add modelines.

Change-Id: I418938d7d6485b27cc51cf1dde50bc42dabf8c85
Reviewed-on: https://code.wireshark.org/review/533
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add wnpa-sec-2014-04.

Change-Id: I3ca3843bf7f25aeafb35c4352367e36ba3f9c41a
Reviewed-on: https://code.wireshark.org/review/540
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add a CVE ID and attribution.

Change-Id: If3359fb1c73446747c6be4ab1f8b05f2697dba6f
Reviewed-on: https://code.wireshark.org/review/541
Reviewed-by: Gerald Combs <gerald@wireshark.org>