------------------------------------------------------------------------
r34004 | gerald | 2010-08-29 15:02:03 -0700 (Sun, 29 Aug 2010) | 2 lines
Changed paths:
   M /trunk-1.2/ChangeLog
   M /trunk-1.2/NEWS
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

Build 1.2.11.

------------------------------------------------------------------------
r34007 | gerald | 2010-08-29 18:16:20 -0700 (Sun, 29 Aug 2010) | 2 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml

Fix the advisory link.

------------------------------------------------------------------------
r34022 | gerald | 2010-08-30 10:57:37 -0700 (Mon, 30 Aug 2010) | 2 lines
Changed paths:
   M /trunk-1.2/config.nmake
   M /trunk-1.2/configure.in
   M /trunk-1.2/debian/changelog
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/version.conf

1.2.11 -> 1.2.12.

------------------------------------------------------------------------
r34066 | gerald | 2010-09-05 10:05:08 -0700 (Sun, 05 Sep 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2010-09-05]
------------------------------------------------------------------------
r34104 | gerald | 2010-09-12 10:05:01 -0700 (Sun, 12 Sep 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2010-09-12]
------------------------------------------------------------------------
r34157 | gerald | 2010-09-19 10:05:10 -0700 (Sun, 19 Sep 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2010-09-19]
------------------------------------------------------------------------
r34255 | gerald | 2010-09-26 10:05:06 -0700 (Sun, 26 Sep 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2010-09-26]
------------------------------------------------------------------------
r34348 | gerald | 2010-10-03 10:04:57 -0700 (Sun, 03 Oct 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf

[Automatic manuf and enterprise-numbers update for 2010-10-03]
------------------------------------------------------------------------
r34390 | gerald | 2010-10-05 16:53:04 -0700 (Tue, 05 Oct 2010) | 2 lines
Changed paths:
   A /trunk-1.2/tools/make-services.pl

Copy over make-services.pl from the trunk.

------------------------------------------------------------------------
r34440 | gerald | 2010-10-08 14:36:53 -0700 (Fri, 08 Oct 2010) | 48 lines
Changed paths:
   M /trunk-1.2/capture.c
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-gtp.c
   M /trunk-1.2/epan/dissectors/packet-ip.c
   M /trunk-1.2/epan/dissectors/packet-rpc.c
   M /trunk-1.2/print.c

Copy over revisions from the trunk:

------------------------------------------------------------------------
r34031 | stig | 2010-08-31 03:24:08 -0700 (Tue, 31 Aug 2010) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-gtp.c

Update the header length after dissecting the header.

This fixes bug 5162.
------------------------------------------------------------------------
r33906 | etxrab | 2010-08-23 23:15:40 -0700 (Mon, 23 Aug 2010) | 3 lines
Changed paths:
   M /trunk/capture.c

From Gregor Beck:
ERROR:capture.c:141:capture_start: assertion failed: (capture_opts->state == CAPTURE_STOPPED)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5126
------------------------------------------------------------------------
r34080 | stig | 2010-09-08 06:38:47 -0700 (Wed, 08 Sep 2010) | 3 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ip.c

Revert revision 33780, because the checksum is only calculated
from the header and not the content.
------------------------------------------------------------------------
r34408 | morriss | 2010-10-07 14:10:51 -0700 (Thu, 07 Oct 2010) | 4 lines
Changed paths:
   M /trunk/epan/dissectors/packet-rpc.c

Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).
------------------------------------------------------------------------


Copy over by hand:

------------------------------------------------------------------------
r34039 | stig | 2010-09-01 13:54:41 -0700 (Wed, 01 Sep 2010) | 2 lines
Changed paths:
   M /trunk/print.c

Ensure we always print the heading when dumping PSML and CSV.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r34441 | gerald | 2010-10-08 14:53:37 -0700 (Fri, 08 Oct 2010) | 16 lines
Changed paths:
   M /trunk-1.2/docbook/release-notes.xml
   M /trunk-1.2/epan/dissectors/packet-ber.c

Copy over r34111.

------------------------------------------------------------------------
r34111 | gerald | 2010-09-13 11:49:55 -0700 (Mon, 13 Sep 2010) | 6 lines
Changed paths:
   M /trunk/epan/dissectors/packet-ber.c

Attempt to fix the stack overflow reported at
http://seclists.org/bugtraq/2010/Sep/87 .

Unfortunately no one from the NCNIPC pen test team has contacted us or
provided a sample capture so the fix hasn't been verified.
------------------------------------------------------------------------

Update the release notes.

------------------------------------------------------------------------
r34452 | gerald | 2010-10-10 09:39:43 -0700 (Sun, 10 Oct 2010) | 1 line
Changed paths:
   M /trunk-1.2/epan/enterprise-numbers
   M /trunk-1.2/manuf
   M /trunk-1.2/services

[Automatic manuf, services and enterprise-numbers update for 2010-10-10]
------------------------------------------------------------------------
r34471 | gerald | 2010-10-11 09:45:58 -0700 (Mon, 11 Oct 2010) | 11 lines
Changed paths:
   M /trunk-1.2/gtk/main.c

Copy over r34468 from the trunk:

------------------------------------------------------------------------
r34468 | stig | 2010-10-11 01:28:38 -0700 (Mon, 11 Oct 2010) | 3 lines
Changed paths:
   M /trunk/gtk/main.c

Don't add a border around the main window, this looks bad in the new
Ubuntu release.
------------------------------------------------------------------------

------------------------------------------------------------------------
r34472 | gerald | 2010-10-11 09:50:56 -0700 (Mon, 11 Oct 2010) | 2 lines
Changed paths:
   M /trunk-1.2/tools/Makefile.am
   M /trunk-1.2/tools/make-services.pl

Add the Id tag to make-services.pl. Add it to the distribution.

------------------------------------------------------------------------
