Update php-sugarcrm to 6.5.22 (6.5.21 includes security fix).

6.5.22

o Feature Enhancements

Enhancements to existing features for Release 6.5.22 are listed below:

    * OAuth 2 support for Google connector : OAuth 2 authentication is now
      supported for Google connector.

o Known Issues

The following are known issues with Sugar 6.5.22:

    * 62064 : Shipping field in the Grand Total and Line Items section of
      quotes does not update as expected when the Shipping field is calculated
      via Sugar Logic.

    * 73330 : Attempting to connect to the IBM SmartCloud application via the
      External Accounts tab does not work as expected.


6.5.21

o Fixed Issues

Sugar 6.5.21 is a security update released to address certain security
vulnerabilities identified during our routine QA checks.

We strongly recommend that you install this update at the earliest
opportunity.  While we have not experienced any reported incidents relating to
these vulnerabilities to date, failure to install this update could leave you
exposed to malicious third party attacks. For more information regarding this,
please refer to the Security Advisory announcement.

These vulnerabilities have been addressed in release 6.5.21 which is available
for download from the Download Manager.

Administrators are strongly encouraged to upgrade their Sugar instances
running 6.5.20 or earlier to 6.5.21 to prevent potential exploitation of these
weaknesses.

3 files changed, 195 insertions, 7 deletions

diff --git a/www/php-sugarcrm/Makefile b/www/php-sugarcrm/Makefile
index 35ff36df8d6..c56fe877d23 100644
--- a/www/php-sugarcrm/Makefile
+++ b/www/php-sugarcrm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/03/15 16:33:22 taca Exp $
+# $NetBSD: Makefile,v 1.10 2015/08/30 15:02:59 taca Exp $
 #
 
-SCVER=		6.5.20
+SCVER=		6.5.22
 DISTNAME=	SugarCE-${SCVER}
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/SugarCE/sugarcrm/}
 CATEGORIES=	www
diff --git a/www/php-sugarcrm/PLIST b/www/php-sugarcrm/PLIST
index b6f84c05413..75069bb218a 100644
--- a/www/php-sugarcrm/PLIST
+++ b/www/php-sugarcrm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/03/15 16:33:22 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/08/30 15:02:59 taca Exp $
 share/sugercrm/HandleAjaxCall.php
 share/sugercrm/LICENSE
 share/sugercrm/LICENSE.txt
@@ -1343,6 +1343,188 @@ share/sugercrm/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContacts
 share/sugercrm/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php
 share/sugercrm/include/generic/SugarWidgets/SugarWidgetSubPanelTopSummaryButton.php
 share/sugercrm/include/globalControlLinks.php
+share/sugercrm/include/google-api-php-client/CONTRIBUTING.md
+share/sugercrm/include/google-api-php-client/LICENSE
+share/sugercrm/include/google-api-php-client/README.md
+share/sugercrm/include/google-api-php-client/autoload.php
+share/sugercrm/include/google-api-php-client/composer.json
+share/sugercrm/include/google-api-php-client/examples/appengineauth.php
+share/sugercrm/include/google-api-php-client/examples/batch.php
+share/sugercrm/include/google-api-php-client/examples/fileupload.php
+share/sugercrm/include/google-api-php-client/examples/idtoken.php
+share/sugercrm/include/google-api-php-client/examples/index.php
+share/sugercrm/include/google-api-php-client/examples/multi-api.php
+share/sugercrm/include/google-api-php-client/examples/service-account.php
+share/sugercrm/include/google-api-php-client/examples/simple-query.php
+share/sugercrm/include/google-api-php-client/examples/simplefileupload.php
+share/sugercrm/include/google-api-php-client/examples/styles/style.css
+share/sugercrm/include/google-api-php-client/examples/templates/base.php
+share/sugercrm/include/google-api-php-client/examples/user-example.php
+share/sugercrm/include/google-api-php-client/phpunit.xml.dist
+share/sugercrm/include/google-api-php-client/src/Google/Auth/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/AppIdentity.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/AssertionCredentials.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/ComputeEngine.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/LoginTicket.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/OAuth2.php
+share/sugercrm/include/google-api-php-client/src/Google/Auth/Simple.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/Apc.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/File.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/Memcache.php
+share/sugercrm/include/google-api-php-client/src/Google/Cache/Null.php
+share/sugercrm/include/google-api-php-client/src/Google/Client.php
+share/sugercrm/include/google-api-php-client/src/Google/Collection.php
+share/sugercrm/include/google-api-php-client/src/Google/Config.php
+share/sugercrm/include/google-api-php-client/src/Google/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Http/Batch.php
+share/sugercrm/include/google-api-php-client/src/Google/Http/CacheParser.php
+share/sugercrm/include/google-api-php-client/src/Google/Http/MediaFileUpload.php
+share/sugercrm/include/google-api-php-client/src/Google/Http/REST.php
+share/sugercrm/include/google-api-php-client/src/Google/Http/Request.php
+share/sugercrm/include/google-api-php-client/src/Google/IO/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/IO/Curl.php
+share/sugercrm/include/google-api-php-client/src/Google/IO/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/IO/Stream.php
+share/sugercrm/include/google-api-php-client/src/Google/IO/cacerts.pem
+share/sugercrm/include/google-api-php-client/src/Google/Logger/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/Logger/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Logger/File.php
+share/sugercrm/include/google-api-php-client/src/Google/Logger/Null.php
+share/sugercrm/include/google-api-php-client/src/Google/Logger/Psr.php
+share/sugercrm/include/google-api-php-client/src/Google/Model.php
+share/sugercrm/include/google-api-php-client/src/Google/Service.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AdExchangeBuyer.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AdExchangeSeller.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AdSense.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AdSenseHost.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Admin.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Analytics.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AndroidEnterprise.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AndroidPublisher.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/AppState.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Appsactivity.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Audit.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Autoscaler.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Bigquery.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Blogger.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Books.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Calendar.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/CivicInfo.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Classroom.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/CloudMonitoring.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/CloudUserAccounts.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Cloudlatencytest.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Cloudresourcemanager.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Cloudsearch.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Compute.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Computeaccounts.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Container.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Coordinate.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Customsearch.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Dataflow.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Datastore.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/DeploymentManager.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Dfareporting.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Directory.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Dns.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/DoubleClickBidManager.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Doubleclicksearch.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Drive.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Fitness.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Freebase.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Fusiontables.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Games.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/GamesConfiguration.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/GamesManagement.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Genomics.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Gmail.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/GroupsMigration.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Groupssettings.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/IdentityToolkit.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Licensing.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Logging.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Manager.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/MapsEngine.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Mirror.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Oauth2.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Pagespeedonline.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Playmoviespartner.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Plus.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/PlusDomains.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Prediction.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Pubsub.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/QPXExpress.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Replicapool.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Replicapoolupdater.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Reports.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Reseller.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Resource.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Resourceviews.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/SQLAdmin.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/ShoppingContent.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/SiteVerification.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Spectrum.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Storage.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/TagManager.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Taskqueue.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Tasks.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Translate.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Urlshortener.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Webfonts.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/Webmasters.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/YouTube.php
+share/sugercrm/include/google-api-php-client/src/Google/Service/YouTubeAnalytics.php
+share/sugercrm/include/google-api-php-client/src/Google/Signer/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/Signer/P12.php
+share/sugercrm/include/google-api-php-client/src/Google/Task/Exception.php
+share/sugercrm/include/google-api-php-client/src/Google/Task/Retryable.php
+share/sugercrm/include/google-api-php-client/src/Google/Task/Runner.php
+share/sugercrm/include/google-api-php-client/src/Google/Utils.php
+share/sugercrm/include/google-api-php-client/src/Google/Utils/URITemplate.php
+share/sugercrm/include/google-api-php-client/src/Google/Verifier/Abstract.php
+share/sugercrm/include/google-api-php-client/src/Google/Verifier/Pem.php
+share/sugercrm/include/google-api-php-client/src/Google/autoload.php
+share/sugercrm/include/google-api-php-client/style/ruleset.xml
+share/sugercrm/include/google-api-php-client/tests/BaseTest.php
+share/sugercrm/include/google-api-php-client/tests/OAuthHelper.php
+share/sugercrm/include/google-api-php-client/tests/README
+share/sugercrm/include/google-api-php-client/tests/adsense/AdSenseTest.php
+share/sugercrm/include/google-api-php-client/tests/bootstrap.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiBatchRequestTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiCacheParserTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiClientTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiMediaFileUploadTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiModelTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ApiOAuth2Test.php
+share/sugercrm/include/google-api-php-client/tests/general/AuthTest.php
+share/sugercrm/include/google-api-php-client/tests/general/CacheTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ComputeEngineAuthTest.php
+share/sugercrm/include/google-api-php-client/tests/general/Http/BatchTest.php
+share/sugercrm/include/google-api-php-client/tests/general/Http/RequestTest.php
+share/sugercrm/include/google-api-php-client/tests/general/IoTest.php
+share/sugercrm/include/google-api-php-client/tests/general/LoggerTest.php
+share/sugercrm/include/google-api-php-client/tests/general/RequestTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ResourceTest.php
+share/sugercrm/include/google-api-php-client/tests/general/RestTest.php
+share/sugercrm/include/google-api-php-client/tests/general/ServiceTest.php
+share/sugercrm/include/google-api-php-client/tests/general/TaskTest.php
+share/sugercrm/include/google-api-php-client/tests/general/URITemplateTest.php
+share/sugercrm/include/google-api-php-client/tests/general/testdata/cacert.json
+share/sugercrm/include/google-api-php-client/tests/general/testdata/cacert.pem
+share/sugercrm/include/google-api-php-client/tests/general/testdata/privkey.pem
+share/sugercrm/include/google-api-php-client/tests/general/testdata/service-12345.json
+share/sugercrm/include/google-api-php-client/tests/general/testdata/service-rsa-12345.json
+share/sugercrm/include/google-api-php-client/tests/general/testdata/test.ini
+share/sugercrm/include/google-api-php-client/tests/general/testdata/test_public_key.pem
+share/sugercrm/include/google-api-php-client/tests/pagespeed/PageSpeedTest.php
+share/sugercrm/include/google-api-php-client/tests/plus/PlusTest.php
+share/sugercrm/include/google-api-php-client/tests/tasks/TasksTest.php
+share/sugercrm/include/google-api-php-client/tests/urlshortener/UrlShortenerTests.php
+share/sugercrm/include/google-api-php-client/tests/youtube/YouTubeTest.php
 share/sugercrm/include/images/1.gif
 share/sugercrm/include/images/SugarPlanet.swf
 share/sugercrm/include/images/blank.gif
@@ -4219,6 +4401,7 @@ share/sugercrm/jssource/src_files/modules/Connectors/Connector.js
 share/sugercrm/jssource/src_files/modules/Contacts/Contact.js
 share/sugercrm/jssource/src_files/modules/Currencies/EditView.js
 share/sugercrm/jssource/src_files/modules/Documents/documents.js
+share/sugercrm/jssource/src_files/modules/EAPM/EAMPOauth.js
 share/sugercrm/jssource/src_files/modules/EAPM/EAPMEdit.js
 share/sugercrm/jssource/src_files/modules/EmailTemplates/EmailTemplate.js
 share/sugercrm/jssource/src_files/modules/Home/about.js
@@ -5025,6 +5208,7 @@ share/sugercrm/modules/DynamicFields/templates/Files/DetailView.php
 share/sugercrm/modules/DynamicFields/templates/Files/EditView.php
 share/sugercrm/modules/DynamicFields/vardefs.php
 share/sugercrm/modules/EAPM/CheckLogins.php
+share/sugercrm/modules/EAPM/EAMPOauth.js
 share/sugercrm/modules/EAPM/EAPM.php
 share/sugercrm/modules/EAPM/EAPMEdit.js
 share/sugercrm/modules/EAPM/action_view_map.php
@@ -5042,9 +5226,11 @@ share/sugercrm/modules/EAPM/metadata/subpanels/default.php
 share/sugercrm/modules/EAPM/tpls/DetailViewFooter.tpl
 share/sugercrm/modules/EAPM/tpls/EditViewFooter.tpl
 share/sugercrm/modules/EAPM/tpls/EditViewHeader.tpl
+share/sugercrm/modules/EAPM/tpls/GoogleOauth2Redirect.tpl
 share/sugercrm/modules/EAPM/vardefs.php
 share/sugercrm/modules/EAPM/views/view.detail.php
 share/sugercrm/modules/EAPM/views/view.edit.php
+share/sugercrm/modules/EAPM/views/view.googleoauth2redirect.php
 share/sugercrm/modules/EmailAddresses/EmailAddress.php
 share/sugercrm/modules/EmailAddresses/language/en_us.lang.php
 share/sugercrm/modules/EmailAddresses/vardefs.php
@@ -5370,11 +5556,13 @@ share/sugercrm/modules/Import/tpls/wizardWrapper.tpl
 share/sugercrm/modules/Import/vardefs.php
 share/sugercrm/modules/Import/views/ImportListView.php
 share/sugercrm/modules/Import/views/ImportView.php
+share/sugercrm/modules/Import/views/view.authenticatedsources.php
 share/sugercrm/modules/Import/views/view.confirm.php
 share/sugercrm/modules/Import/views/view.dupcheck.php
 share/sugercrm/modules/Import/views/view.error.php
 share/sugercrm/modules/Import/views/view.extdupcheck.php
 share/sugercrm/modules/Import/views/view.last.php
+share/sugercrm/modules/Import/views/view.revokeaccess.php
 share/sugercrm/modules/Import/views/view.step1.php
 share/sugercrm/modules/Import/views/view.step2.php
 share/sugercrm/modules/Import/views/view.step3.php
diff --git a/www/php-sugarcrm/distinfo b/www/php-sugarcrm/distinfo
index a9fdf2bd02e..9cf279728d8 100644
--- a/www/php-sugarcrm/distinfo
+++ b/www/php-sugarcrm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2015/03/15 16:33:22 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/08/30 15:02:59 taca Exp $
 
-SHA1 (SugarCE-6.5.20.zip) = deae136a5027e9b372d380a270b986da65af1005
-RMD160 (SugarCE-6.5.20.zip) = e7b51f3192cd1c08f4c8737f2160acfb0db4062b
-Size (SugarCE-6.5.20.zip) = 21270144 bytes
+SHA1 (SugarCE-6.5.22.zip) = 1937cce219f449d59ba2d176fe8d665b9e266d95
+RMD160 (SugarCE-6.5.22.zip) = f94cd4ea3a8bb4771095a24a9275fb693d8290a5
+Size (SugarCE-6.5.22.zip) = 22095321 bytes