From 7c1cc4678e7ae07bde8706e21bd10b19893963c9 Mon Sep 17 00:00:00 2001 From: Gianni Ceccarelli Date: Thu, 23 Oct 2014 17:17:57 +0100 Subject: fix patches for subsonic 5 --- media-sound/subsonic/files/no-license-5.patch | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 media-sound/subsonic/files/no-license-5.patch (limited to 'media-sound/subsonic/files/no-license-5.patch') diff --git a/media-sound/subsonic/files/no-license-5.patch b/media-sound/subsonic/files/no-license-5.patch new file mode 100644 index 0000000..3a63fbb --- /dev/null +++ b/media-sound/subsonic/files/no-license-5.patch @@ -0,0 +1,43 @@ +Index: subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java +=================================================================== +--- subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java (revision 4108) ++++ subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java (working copy) +@@ -654,7 +654,7 @@ + if (email == null || license == null) { + return false; + } +- return license.equalsIgnoreCase(StringUtil.md5Hex(email.toLowerCase())); ++ return true; + } + + public LicenseInfo getLicenseInfo() { +@@ -1272,28 +1272,7 @@ + + licenseValidated = true; + +- HttpClient client = new DefaultHttpClient(); +- HttpConnectionParams.setConnectionTimeout(client.getParams(), 120000); +- HttpConnectionParams.setSoTimeout(client.getParams(), 120000); +- HttpGet method = new HttpGet("http://subsonic.org/backend/validateLicense.view" + "?email=" + StringUtil.urlEncode(email) + +- "&date=" + date.getTime() + "&version=" + versionService.getLocalVersion()); +- try { +- ResponseHandler responseHandler = new BasicResponseHandler(); +- String content = client.execute(method, responseHandler); +- licenseValidated = content != null && !content.contains("false"); +- if (!licenseValidated) { +- LOG.warn("License key is not valid."); +- } +- String[] lines = StringUtils.split(content); +- if (lines.length > 1) { +- licenseExpires = new Date(Long.parseLong(lines[1])); +- } +- +- } catch (Throwable x) { +- LOG.warn("Failed to validate license.", x); +- } finally { +- client.getConnectionManager().shutdown(); +- } ++ return; + } + + public synchronized void scheduleLicenseValidation() { -- cgit v1.2.3