pidgin/old.pidgin.im

Merging

2017-05-04, Gary Kramlich
2709b64ce0ed
Parents edd45f7832f4c8a39945efc0
Children b7a7b038849f
Merging
2 files changed, 2 insertions(+), 2 deletions(-)
  • +1 -1
    htdocs/ChangeLog
  • +1 -1
    htdocs/index.php
    • --- a/htdocs/ChangeLog Thu May 04 00:26:32 2017 -0500
    +++ b/htdocs/ChangeLog Thu May 04 00:27:17 2017 -0500
    @@ -2,7 +2,7 @@
    version 2.12.0 (03/09/2017):
    libpurple:
    - * Fix an out of bounds memory read in purple_markup_unescape_entity.
    + * Fix an out of bounds memory write in purple_markup_unescape_entity.
    CVE-2017-2640
    * Fix use of uninitialised memory if running non-debug-enabled versions of glib
    * Updated AIM dev and dist ID's to new ones that were assigned by AOL.
    --- a/htdocs/index.php Thu May 04 00:26:32 2017 -0500
    +++ b/htdocs/index.php Thu May 04 00:27:17 2017 -0500
    @@ -117,7 +117,7 @@
    <p class="more" id="lowblurb">
    <!-- Put little news blurbs here! -->
    -Pidgin 2.12.0 removed protocols that were not being maintained: Facebook&nbsp;XMPP, MSN, MySpace, Mxit, and Yahoo!. These will show up as unknown in your account lists until you delete them.
    +Pidgin 2.12.0 removed protocols that were not being maintained: MSN, MySpace, Mxit, and Yahoo!. These will show up as unknown in your account lists until you delete them.
    <br /><br />
    AIM is not breaking, update to this version to keep it working!
    </p>