Pullup ticket #4192 - requested by tron
net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile	patch
- net/wireshark/distinfo	patch

-------------------------------------------------------------------
Update "wireshark" package to version 1.8.9. Changes since 1.8.8:
- The following vulnerabilities have been fixed:
  o wnpa-sec-2013-45
    The Bluetooth SDP dissector could go into a large loop.
    Discovered by Laurent Butti. (Bug 8831)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4927
  o wnpa-sec-2013-47
    The DIS dissector could go into a large loop. (Bug 8911)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4929
  o wnpa-sec-2013-48
    The DVB-CI dissector could crash. Discovered by Laurent Butti.
    (Bug 8916)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4930
  o wnpa-sec-2013-49
    The GSM RR dissector (and possibly others) could go into a
    large loop. (Bug 8923)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4931
  o wnpa-sec-2013-50
    The GSM A Common dissector could crash. (Bug 8940)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4932
  o wnpa-sec-2013-51
    The Netmon file parser could crash. Discovered by G. Geshev.
    (Bug 8742)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4933
    CVE-2013-4934
  o wnpa-sec-2013-52
    The ASN.1 PER dissector could crash. Discovered by
    Oliver-Tobias Ripka. (Bug 8722)
    Versions affected: 1.10.0, 1.8.0 to 1.8.8.
    CVE-2013-4935
- The following bugs have been fixed:
  o Wireshark hides under Taskbar. (Bug 3034)
  o Wireshark doesn't translate IEEE802a OUI. (Bug 3123)
  o IEEE 802.15.4 frame check sequence in "Chipcon mode" not
    displayed correctly. (Bug 4507)
  o Mask in Lua ProtoField.uint32() does not work as expected.
    (Bug 5734)
  o Lines of text are truncated if they are either longer than the
    paper width or past the paper height. (Bug 7543)
  o [PATCH] Add MAC-DATA support to TETRA dissector and other
    minor improvements. (Bug 8708)
  o Wireshark writes empty NRB FQDN which makes trace unloadable.
    (Bug 8763)
  o Wrong encoding for 2 pod files, UTF-8 characters in another.
    (Bug 8774)
  o SCSI (SPC) sense key specific information field must not
    include SKSV. (Bug 8782)
  o Wireshark crashes when closing Flow Graph with Graph Analysis
    opened. (Bug 8793)
  o Detection of IPv6 works only on Solaris 8. (Bug 8813)
  o ansi_637_tele dissector displays MSB as MBS for Call-Back
    Number. (Bug 8851)
  o Dropped bytes in IMAP dissector. (Bug 8857)
  o Kismet drone/server dissector improvements. (Bug 8864)
  o iostat_draw sizeof mismatch. (Bug 8888)
  o SIP stats shows incorrect values for Max/Ave setup times. (Bug
    8897)
  o Graph Filter field limited to 256 characters. (Bug 8909)
  o All mongodb query show as [Malformed Packet: MONGO]. (Bug
    8960)
- Updated Protocol Support
  ANSI IS-637-A, ASN.1 PER, ASN.1, DCERPC NDR, Ethernet, H.235, IEEE
  802.15.4, IEEE 802a, IMAP, KDSP, MAC-LTE, MONGO, PDCP-LTE, RLC,
  RLC-LTE, SCSI, SoulSeek, TETRA
- New and Updated Capture File Support
  Microsoft Network Monitor, pcap-ng.
Pullup ticket #4191 - requested by tron
databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.117
- databases/phpmyadmin/PLIST                                    1.33
- databases/phpmyadmin/distinfo                                 1.74

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Jul 29 20:01:02 UTC 2013

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile PLIST distinfo

   Log Message:
   Update "phpmyadmin" package to version 3.5.8.2. Changes since 3.5.8.1:
   - [security] Fix self-XSS in "Showing rows", see PMASA-2013-8
   - [security] Fix self-XSS in Display chart, see PMASA-2013-9
   - [security] Fix stored XSS in Server status monitor, see PMASA-2013-9
   - [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
   - [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2=
   013-9
   + [security] JSON content type header for version_check.php, see PMASA-2013=
   -9
   + [security] Backport fix for jQuery issue #9521 from jQuery 1.6.3, see PMA=
   SA-2013-9
   + [security] Fix full path disclosure, see PMASA-2013-12
   + [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-=
   15
   + [security] Fix control user SQL injection in schema_export.php, see PMASA=
   -2013-15
   - [security] Fix self-XSS in schema export, see PMASA-2013-14
   - [security] Fix unencoded json object, see PMASA-2013-11


   To generate a diff of this commit:
   cvs rdiff -u -r1.116 -r1.117 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/phpmyadmin/PLIST
   cvs rdiff -u -r1.73 -r1.74 pkgsrc/databases/phpmyadmin/distinfo
pullups 4191 and 4192