Backport graphics/edje PLIST fix.
PLIST fix for graphics/gimp.
Build fix for graphics/shotwell.
Backport net/openvpn fix from trunk.
Pullup ticket #4193 - requested by ryoon
www/apache24: security update

Revisions pulled up:
- www/apache24/Makefile                                         1.21 via patch
- www/apache24/PLIST                                            1.11
- www/apache24/distinfo                                         1.10
- www/apache24/patches/patch-support_htdbm.c                    deleted
- www/apache24/patches/patch-support_htdigest.c                 deleted
- www/apache24/patches/patch-support_htpasswd.c                 deleted
- www/apache24/patches/patch-support_passwd__common.c           deleted
- www/apache24/patches/patch-support_passwd__common.h           deleted

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Tue Jul 30 12:51:29 UTC 2013

   Modified Files:
   	pkgsrc/www/apache24: Makefile PLIST distinfo
   Removed Files:
   	pkgsrc/www/apache24/patches: patch-support_htdbm.c
   	    patch-support_htdigest.c patch-support_htpasswd.c
   	    patch-support_passwd__common.c patch-support_passwd__common.h

   Log Message:
   Update to 2.4.6

   Changelog:
   Security buxfixes.
       SECURITY: CVE-2013-1896 (cve.mitre.org) Sending a MERGE request against a URI handled by mod_dav_svn with the source href (sent as part of the request body as XML) pointing to a URI that is not configured for DAV will trigger a segfault.
       SECURITY: CVE-2013-2249 (cve.mitre.org) mod_session_dbd: Make sure that dirty flag is respected when saving sessions, and ensure the session ID is changed each time the session changes. This changes the format of the updatesession SQL statement. Existing configurations must be changed.

   And feature enhancement and bugfixes.
Pullup ticket #4193.
Pullup ticket #4194 - requested by is
lang/swi-prolog-lite: bug fix patch

Revisions pulled up:
- lang/swi-prolog-lite/Makefile                                 1.22
- lang/swi-prolog-lite/files/shlib.pl                           deleted

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Fri Jul 26 09:29:35 UTC 2013

   Modified Files:
   	pkgsrc/lang/swi-prolog-lite: Makefile
   Removed Files:
   	pkgsrc/lang/swi-prolog-lite/files: shlib.pl

   Log Message:
   Don't overwrite shlib.pl with the really old version from files/ .
   Fixes PR 48067 by Matthias Kretschmer.
   Tests: Backported to 2013Q1, it passes "make test" on NetBSD/i386
   6.1, the PR submitter's quick test as well as the PR submitter's
   extended application that triggered the PR.
Pullup ticket #4194.
Pullup ticket #4195 - requested by bouyer
mail/spamassassin: bug fix patch

Revisions pulled up:
- mail/spamassassin/Makefile                                    1.109
- mail/spamassassin/distinfo                                    1.60 via patch
- mail/spamassassin/patches/patch-sa-update                     1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Aug  1 10:29:00 UTC 2013

   Modified Files:
   	pkgsrc/mail/spamassassin: Makefile distinfo
   Added Files:
   	pkgsrc/mail/spamassassin/patches: patch-sa-update

   Log Message:
   Add a patch from the svn repository (via
   https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872).
   Fix sa-update with new p5-Net-DNS.
   Bump PKGREVISION
Pullup ticket #4195.
Disable readline support, make mysql56 build with embedded editline
for now. For 2013Q3, we should patch real readline support, or
go with pkgsrc default of devel/editline.
Add support for InnoDB Memcached plugin
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
Pullup ticket #4196 - requested by taca
lang/php54: security patch

Revisions pulled up:
- lang/php54/Makefile                                           1.11
- lang/php54/distinfo                                           1.21
- lang/php54/patches/patch-ext_xml_xml.c                        1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Jul 29 16:22:38 UTC 2013

   Modified Files:
   	pkgsrc/lang/php54: Makefile distinfo
   Added Files:
   	pkgsrc/lang/php54/patches: patch-ext_xml_xml.c

   Log Message:
   Add fix for CVE-2013-4113 as php 5.3.27.  (It will be fixed in next PHP 5.4
   release.)

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php54/Makefile
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/php54/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php54/patches/patch-ext_xml_xml.c
Pullup ticket #4197 - requested by taca
www/typo3_45: security update

Revisions pulled up:
- www/typo3_45/Makefile                                         1.26
- www/typo3_45/PLIST                                            1.12
- www/typo3_45/distinfo                                         1.21

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Aug  4 16:23:57 UTC 2013

   Modified Files:
   	pkgsrc/www/typo3_45: Makefile PLIST distinfo

   Log Message:
   Update typo3_45 to 4.5.29 (TYPO3 4.5.29).

   4.5.28:	maintenance release.
   4.5.29: Fix typo3-core-sa-2013-002.

   For full changes, please ChangeLog file.


   To generate a diff of this commit:
   cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/typo3_45/Makefile
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/typo3_45/PLIST
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/typo3_45/distinfo
Pullup ticket #4198 - requested by taca
www/typo3_47: security update

Revisions pulled up:
- www/typo3_47/Makefile                                         1.17
- www/typo3_47/PLIST                                            1.9
- www/typo3_47/distinfo                                         1.12

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Aug  4 16:24:59 UTC 2013

   Modified Files:
   	pkgsrc/www/typo3_47: Makefile PLIST distinfo

   Log Message:
   Update typo3_47 to 4.7.14 (TYPO3 4.7.14).

   4.7.13:	maintenance release.
   4.7.14: Fix typo3-core-sa-2013-002.

   For full changes, please ChangeLog file.


   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/typo3_47/Makefile
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/typo3_47/PLIST
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/typo3_47/distinfo
Pullup ticket #4199 - requested by taca
www/typo3_60: security update

Revisions pulled up:
- www/typo3_60/Makefile                                         1.3
- www/typo3_60/PLIST                                            1.3
- www/typo3_60/distinfo                                         1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Aug  4 16:26:06 UTC 2013

   Modified Files:
   	pkgsrc/www/typo3_60: Makefile PLIST distinfo

   Log Message:
   Update typo3_60 to 4.6.8 (TYPO3 4.6.8).

   4.6.7:	maintenance release.
   4.6.8: Fix typo3-core-sa-2013-002.

   For full changes, please ChangeLog file.


   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/typo3_60/Makefile \
       pkgsrc/www/typo3_60/PLIST pkgsrc/www/typo3_60/distinfo
pullups 4196 4197 4198 4199