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/Manifest | 4 ++- media-sound/subsonic/files/no-installers-5.patch | 22 ++++++++++++ media-sound/subsonic/files/no-license-5.patch | 43 ++++++++++++++++++++++++ media-sound/subsonic/subsonic-5.0.ebuild | 4 +-- 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 media-sound/subsonic/files/no-installers-5.patch create mode 100644 media-sound/subsonic/files/no-license-5.patch (limited to 'media-sound/subsonic') diff --git a/media-sound/subsonic/Manifest b/media-sound/subsonic/Manifest index 6005d4b..ff81fa2 100644 --- a/media-sound/subsonic/Manifest +++ b/media-sound/subsonic/Manifest @@ -1,7 +1,9 @@ +AUX no-installers-5.patch 751 SHA256 abedc6cd6af3a5866ec71d7521eec69c694fa1c86956fbf630090cb3bb8457a3 SHA512 29f0c718dd83c22c56c6a991d65c7d806514dfd8191eb9fe3ded59776b5e6ec32b6d695d5b556a0037e8d5f3a65533a1f534795ea5ed6c429109d6b672d5a3b9 WHIRLPOOL dcf1dc28931b9a50201e6f6183c5d71e9fd188b8c252dadba19ffdaa0c0155f1cf967adce5f41688e00dfe8eb9c16c4c9d34015b76229de60836bab30975d4b7 AUX no-installers.patch 751 SHA256 a5adfdcf9ce0985bac9e3a45fc9c991fc98f725fdf2f65fbdf8be0d327d4fe44 SHA512 7e25267c5c0f8db18cbc98cf9440dfac49354136c05d632c9c17dce0c0a13d852cfe45e9649968d03f01153f04ec7e7d5f9ea5c199ba048e4f721b151be81b8d WHIRLPOOL 897e8bfb84c3e46c130d86526f4caf23e4fd6c869d041feb6bbd848ac2954fb509790502d076f04b2b674593f3ba5c90453d837a354fd9b79c4baed5c98ab26d +AUX no-license-5.patch 1956 SHA256 a3dab4e237eb471242e8a277388ceb5d1ec54847a6b190a6decb157929c09a72 SHA512 31b58c668221ed9cafe11645adbd1da5ddaf33b2d8401cceeeaa9a8ec8ac5e03902ba851ea25e85ce968382d32f8c53a64f29280dd7aeca37ab3ffdb78cfa687 WHIRLPOOL 7017cef881fdf7368db9deb16b103a85ed603b702422038e68c57d508b0fd30fbc8f6bfbc6a157c6c574dc75d6908accd3f2123aab3cf1df0ea8d503a441d470 AUX no-license.patch 1966 SHA256 9484706e6a7c9ab6641b8780c7f6dcd9e0980f630dd41693f82c776ee4b65016 SHA512 993b6646f5eca4ca7b579c7979eadb462bdf7b11e1330b1916ef5a8474335ccead64a14a8bbe43a627755aa9cec028dfb1192039907e71ced9aa80ed46730aaf WHIRLPOOL 618dcdaa3d630c436f2c4f45021506c148e75f3f2bade49d54182d14098bbcd79ad7db81cf403af5b7d9cdbbbe4388805c9ab894fabd2de8c4e8f39bd3ab1675 AUX subsonic.confd 574 SHA256 4b783e2acd0d672bc9d60a594d4b41876dbb0b1c9b01cf9d50d4504d5d685975 SHA512 d018d359389d0e17a7d3efd71aa0e4b0aa8cdda6b6fd65856bec76f4a534270df5c27e7942e08b76353736d85fa2374c0b5f011b39817d2454b3871ad1ec990d WHIRLPOOL 33a7edb37fa2c22d0d6aa21637cd5ba86686a880c5e5caeb7d491b22a26f72336a8f5b56081a292a5554c0ad3311d8067e437b3bd9ee053d5b64a8a58ceea919 AUX subsonic.initd 871 SHA256 3db5fe1b5349912bc6b5fb18311ccec894daa0dc409b912d497f9d7c4f68c4d5 SHA512 f8f66c0af9bd2e617be1305b7b967b1ee0f7e00a239200ac9f8898dfb435a9aee451a39861eee0119b0c0732583851da1172b483aadb9d67b9213006c334e95a WHIRLPOOL dfa614df267d5fd01e677d2b29602bb86c7090a9a61d56d1c8e3c602978e245a07b6ad622683eb247e9b044b6e4e3c0cf7a1117046782866237f004ba2603516 EBUILD subsonic-4.8.ebuild 1584 SHA256 7dce6fb3941771639274ab4741e0d02c3d518df8e68b90983b91cf7783a88d6d SHA512 b3adb29cb9f2d997e7db7d474d386c2e3f40b766dfbb663a89e9d7083b18dad09b2848736cf9da101e412e4be41c1d6a261571a846a4992aca2d58ee9c8e0726 WHIRLPOOL 4ec26a176429bd8569faea193cad7fc0c08d5425f3693953dfbc6df61796757638181a4771ea765840ab3a9bfe38f3efaafad9491d26f3b131710ee4bfef0f26 EBUILD subsonic-4.9.ebuild 1585 SHA256 ecfaba54ac56b1ca5b2f83ea152e109c2ea885913029a66c936b77190d8fd707 SHA512 12c91580dc1327cf17595b6e4e1314ef1cd1d676d2d80f12d325ff4783acc0695b8a99f24f93a4bd622559cc206c79c4ece2f534a18e7f1fbf1ac4a17f5c668e WHIRLPOOL aa940e04bdc8f9a38e3e0698402cba57c8d49119c2857d5971fd18da05d8c1183f362846741efe73d0d56f068c30c11f3de2618d9dd28cfd8c2d5b101c970681 -EBUILD subsonic-5.0.ebuild 1585 SHA256 ecfaba54ac56b1ca5b2f83ea152e109c2ea885913029a66c936b77190d8fd707 SHA512 12c91580dc1327cf17595b6e4e1314ef1cd1d676d2d80f12d325ff4783acc0695b8a99f24f93a4bd622559cc206c79c4ece2f534a18e7f1fbf1ac4a17f5c668e WHIRLPOOL aa940e04bdc8f9a38e3e0698402cba57c8d49119c2857d5971fd18da05d8c1183f362846741efe73d0d56f068c30c11f3de2618d9dd28cfd8c2d5b101c970681 +EBUILD subsonic-5.0.ebuild 1589 SHA256 ea2cae68a49a681b0704a86ff8e81ccb6eacb91287e8fb7631bf79128f22a337 SHA512 30d30ea82e1f1fd2c9e93ea4fbf8f3fb54cfca7aa2e6fc6bfcb80961432743294e19502fbe8979c70001d95bad33a1f3c82805f959334a5f6581e455be47936a WHIRLPOOL b5441db548c185970e920a433c8e4dad254c6f53fb16f33b804980972a51c0581434b3259f441bf6c57c90342d74aefc62b649fd78404bd388490384eb6c989d diff --git a/media-sound/subsonic/files/no-installers-5.patch b/media-sound/subsonic/files/no-installers-5.patch new file mode 100644 index 0000000..af66c53 --- /dev/null +++ b/media-sound/subsonic/files/no-installers-5.patch @@ -0,0 +1,22 @@ +Index: pom.xml +=================================================================== +--- pom.xml (revision 4108) ++++ pom.xml (working copy) +@@ -93,10 +93,6 @@ + full + + subsonic-booter +- subsonic-installer-windows +- subsonic-installer-mac +- subsonic-installer-debian +- subsonic-installer-rpm + subsonic-backend + subsonic-site + subsonic-assembly +@@ -170,4 +166,4 @@ + + + +- +\ No newline at end of file ++ 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() { diff --git a/media-sound/subsonic/subsonic-5.0.ebuild b/media-sound/subsonic/subsonic-5.0.ebuild index c90871b..1d3d9f1 100644 --- a/media-sound/subsonic/subsonic-5.0.ebuild +++ b/media-sound/subsonic/subsonic-5.0.ebuild @@ -30,8 +30,8 @@ pkg_preinst() { } src_prepare() { - use no-license && epatch "${FILESDIR}"/no-license.patch - epatch "${FILESDIR}"/no-installers.patch + use no-license && epatch "${FILESDIR}"/no-license-5.patch + epatch "${FILESDIR}"/no-installers-5.patch } src_compile() { -- cgit v1.2.3