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

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

Change-Id: Iaeaacaacafc4a829e693f8b4c66614748d0e67ca
Reviewed-on: https://code.wireshark.org/review/469
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Update svnversion.h with (short) SHA-1 commit id and branch when use git repository

svn path=/trunk/; revision=44850
(cherry picked from commit 8f4a2e5f28f241f2afb6004833528db20ff5e013)

Change-Id: I989390f9c4d96d434571193aa923c95cf110c8bb
Reviewed-on: https://code.wireshark.org/review/477
Reviewed-by: Gerald Combs <gerald@wireshark.org>
More git revision updates.

Includes a partial cherry-pick of gf8002de.

Change-Id: I2d641001610aa1c46f64a9929e3114a76ba3ce2c
Reviewed-on: https://code.wireshark.org/review/480
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>
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>
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>
(cherry picked from commit 31187b1c5d863e2338f0050ff897512b92ebf774)
Reviewed-on: https://code.wireshark.org/review/490
Update the release notes.

Change-Id: Ia939f89cf89c56cbdd26755b98c16fe265bd1dd9
Reviewed-on: https://code.wireshark.org/review/504
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add CVE IDs.

Change-Id: I9a99fb3b4ffef46ef90103032e1a78aa9f8f68c1
Reviewed-on: https://code.wireshark.org/review/524
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>
(cherry picked from commit 34144b8d4da141e8aa9b99221855edc9f4c73ad8)
Reviewed-on: https://code.wireshark.org/review/534
Add wnpa-sec-2014-04.

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

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