http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=37182
User: gerald
Date: 2011/05/16 11:27 AM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r37162 | alagoutte | 2011-05-15 10:47:56 -0700 (Sun, 15 May 2011) | 5 lines
Changed paths:
M /trunk/epan/dissectors/packet-icmpv6.c
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5921
Fix for RPL DAO-ACK Processing when DODAG ID present
Reported and fixed by Jakob Ruhe
------------------------------------------------------------------------
r37167 | gerald | 2011-05-15 12:25:50 -0700 (Sun, 15 May 2011) | 5 lines
Changed paths:
M /trunk/packaging/macosx/Scripts/chmodbpf-postinstall.sh
Fix the ChmodBPF startup item permissions. Handling this within
PackageMaker would be a more correct fix. Replacing PackageMaker with
something that fits our development and deployment model would be an
even more correct fix.
------------------------------------------------------------------------
r37181 | morriss | 2011-05-16 10:02:22 -0700 (Mon, 16 May 2011) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-netflow.c
Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/packaging/macosx/Scripts/
Changes Path Action
+4 -1 chmodbpf-postinstall.sh Modified
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+1 -0 packet-icmpv6.c Modified
+1 -1 packet-netflow.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+8 -1 release-notes.xml Modified
Directory: /trunk-1.6/
Changes Path Action
+95692 -6560 ChangeLog Modified
+5 -0 version.conf Modified