[Pkg-owncloud-commits] [owncloud] 01/01: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Apr 16 02:24:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch wip/stable8
in repository owncloud.
commit 78d643fd08c33b323b5f999d8216ec809f371e7c
Author: David Prévot <taffit at debian.org>
Date: Wed Apr 15 22:21:24 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 68 +++++++++-------------
debian/patches/0002-Fix-displayed-version.patch | 10 ++--
debian/patches/0003-Improve-logfile-handling.patch | 10 ++--
.../0004-Make-isCurrentHtaccess-a-noop.patch | 4 +-
.../0008-use-JSqueeze-instead-of-JSMin-13052.patch | 6 +-
debian/patches/0009-updating-ZipStreamer.patch | 19 +++---
debian/patches/path/0005-Adapt-aws-sdk-path.patch | 4 +-
.../0006-Adapt-google-api-php-client-path.patch | 12 ++--
debian/patches/path/0007-Adapt-Dropbox-path.patch | 13 +++--
9 files changed, 65 insertions(+), 81 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 92c699c..d6a1ef3 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -12,20 +12,19 @@ Forwarded: not-needed
Reviewed-by: David Prévot <taffit at debian.org>
Last-Update: 2014-04-22
---
- config/config.sample.php | 8 +++++---
- lib/base.php | 2 +-
- lib/private/app.php | 2 +-
- lib/private/ocsclient.php | 2 +-
- lib/private/util.php | 2 +-
- settings/controller/appsettingscontroller.php | 2 +-
- settings/templates/apps.php | 2 +-
- 7 files changed, 11 insertions(+), 9 deletions(-)
+ config/config.sample.php | 8 +++++---
+ lib/base.php | 2 +-
+ lib/private/app.php | 2 +-
+ lib/private/ocsclient.php | 2 +-
+ lib/private/util.php | 2 +-
+ settings/templates/apps.php | 2 +-
+ 6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 0423adc..bd61a75 100644
+index e3b81f6..4c4d5cd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -557,8 +557,9 @@ $CONFIG = array(
+@@ -568,8 +568,9 @@ $CONFIG = array(
/**
* When enabled, admins may install apps from the ownCloud app store.
* The app store is disabled by default for ownCloud Enterprise Edition
@@ -36,7 +35,7 @@ index 0423adc..bd61a75 100644
/**
* The URL of the appstore to use.
-@@ -572,12 +573,13 @@ $CONFIG = array(
+@@ -592,12 +593,13 @@ $CONFIG = array(
* file system path to the app folder. The key ``url`` defines the HTTP web path
* to that folder, starting from the ownCloud web root. The key ``writable``
* indicates if a web server can write files to that folder.
@@ -53,10 +52,10 @@ index 0423adc..bd61a75 100644
),
diff --git a/lib/base.php b/lib/base.php
-index 8609743..55adf0b 100644
+index f0c5464..4f012a6 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -157,7 +157,7 @@ class OC {
+@@ -205,7 +205,7 @@ class OC {
}
}
} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
@@ -66,11 +65,11 @@ index 8609743..55adf0b 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index d3dcf1f..54fbaad 100644
+index aec67e6..e94b891 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -502,7 +502,7 @@ class OC_App {
- * @return string
+@@ -495,7 +495,7 @@ class OC_App {
+ * @return string|false
*/
public static function getInstallPath() {
- if (OC_Config::getValue('appstoreenabled', true) == false) {
@@ -79,23 +78,23 @@ index d3dcf1f..54fbaad 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index 7ce6723..b779836 100644
+index b00772f..a32b829 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
-@@ -33,7 +33,7 @@ class OC_OCSClient{
+@@ -68,7 +68,7 @@ class OCSClient {
* @return bool
*/
- protected static function isAppstoreEnabled() {
-- if(OC::$server->getConfig()->getSystemValue('appstoreenabled', true) === false OR OC_Util::getEditionString() !== '') {
-+ if(OC::$server->getConfig()->getSystemValue('appstoreenabled', false) === false OR OC_Util::getEditionString() !== '') {
- return false;
- }
+ public function isAppStoreEnabled() {
+- return $this->config->getSystemValue('appstoreenabled', true) === true;
++ return $this->config->getSystemValue('appstoreenabled', false) === true;
+ }
+ /**
diff --git a/lib/private/util.php b/lib/private/util.php
-index 9454d9f..3b4ca13 100644
+index 102dc8c..5f06787 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -515,7 +515,7 @@ class OC_Util {
+@@ -590,7 +590,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
@@ -104,25 +103,12 @@ index 9454d9f..3b4ca13 100644
if (OC_App::getInstallPath() === null
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath())
-diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
-index 7240343..8ff68ea 100644
---- a/settings/controller/appsettingscontroller.php
-+++ b/settings/controller/appsettingscontroller.php
-@@ -63,7 +63,7 @@ class AppSettingsController extends Controller {
- ['id' => 1, 'displayName' => (string)$this->l10n->t('Not enabled')],
- ];
-
-- if($this->config->getSystemValue('appstoreenabled', true)) {
-+ if($this->config->getSystemValue('appstoreenabled', false)) {
- $categories[] = ['id' => 2, 'displayName' => (string)$this->l10n->t('Recommended')];
- // apps from external repo via OCS
- $ocs = \OC_OCSClient::getCategories();
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 02cab16..ca2c374 100644
+index 31de7fa..452d7f3 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
-@@ -3,7 +3,7 @@
- <li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li>
+@@ -29,7 +29,7 @@ script(
+ </li>
{{/each}}
-<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index 1e5a863..762ca32 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-10-17
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index bd61a75..1908918 100644
+index 4c4d5cd..89ddcb2 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -430,7 +430,7 @@ $CONFIG = array(
@@ -31,10 +31,10 @@ index bd61a75..1908918 100644
/**
* Is ownCloud connected to the Internet or running in a closed network?
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index f8cee15..99b10e4 100644
+index 448276c..3b67d5b 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -43,7 +43,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -75,7 +75,7 @@ class OC_TemplateLayout extends OC_Template {
}
// Update notification
@@ -44,10 +44,10 @@ index f8cee15..99b10e4 100644
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
\OC::$server->getConfig());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 3b4ca13..912ad27 100644
+index 5f06787..528400c 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1337,7 +1337,7 @@ class OC_Util {
+@@ -1394,7 +1394,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 18af032..d5e9719 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -14,7 +14,7 @@ Last-Update: 2013-10-23
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 1908918..f71ee84 100644
+index 89ddcb2..4644cb0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -477,8 +477,9 @@ $CONFIG = array(
@@ -29,10 +29,10 @@ index 1908918..f71ee84 100644
/**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
diff --git a/lib/base.php b/lib/base.php
-index 55adf0b..5be7de6 100644
+index 4f012a6..57eea17 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -675,7 +675,7 @@ class OC {
+@@ -760,7 +760,7 @@ class OC {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
@@ -42,10 +42,10 @@ index 55adf0b..5be7de6 100644
}
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
-index c8ae610..d097ccf 100644
+index 049b8db..44ca078 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
-@@ -33,7 +33,7 @@ class OC_Log_Owncloud {
+@@ -45,7 +45,7 @@ class OC_Log_Owncloud {
* Init class data
*/
public static function init() {
diff --git a/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
index 348a846..64409d7 100644
--- a/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
+++ b/debian/patches/0004-Make-isCurrentHtaccess-a-noop.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index e3a29b6..69c9c62 100644
+index 7ca30e1..230d1ce 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
-@@ -256,13 +256,7 @@ class OC_Setup {
+@@ -382,13 +382,7 @@ class Setup {
* @return bool
*/
private function isCurrentHtaccess() {
diff --git a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
index b06664e..375ab4b 100644
--- a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
+++ b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
@@ -120,10 +120,10 @@ index 0000000..8ea5033
+ }
+}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index 99b10e4..ff53ebc 100644
+index 3b67d5b..75125f0 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -5,7 +5,7 @@ use Assetic\AssetWriter;
+@@ -37,7 +37,7 @@ use Assetic\AssetWriter;
use Assetic\Filter\CssImportFilter;
use Assetic\Filter\CssMinFilter;
use Assetic\Filter\CssRewriteFilter;
@@ -132,7 +132,7 @@ index 99b10e4..ff53ebc 100644
use OC\Assetic\SeparatorFilter; // waiting on upstream
/**
-@@ -173,7 +173,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -209,7 +209,7 @@ class OC_TemplateLayout extends OC_Template {
), $root, $file);
}
return new FileAsset($root . '/' . $file, array(
diff --git a/debian/patches/0009-updating-ZipStreamer.patch b/debian/patches/0009-updating-ZipStreamer.patch
index 5a6176f..c58555a 100644
--- a/debian/patches/0009-updating-ZipStreamer.patch
+++ b/debian/patches/0009-updating-ZipStreamer.patch
@@ -8,26 +8,21 @@ Origin: upstream, https://github.com/owncloud/core/commit/ca55c10d668904ed350dff
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/private/files.php b/lib/private/files.php
-index 496ba1b..eb2e410 100644
+index 97f9d81..0b516e3 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
-@@ -1,4 +1,5 @@
- <?php
-+use ZipStreamer\ZipStreamer;
-
- /**
- * ownCloud
-@@ -21,9 +22,6 @@
+@@ -39,9 +39,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
-
+-
-// TODO: get rid of this using proper composer packages
-require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
--
++use ZipStreamer\ZipStreamer;
+
/**
* Class for file server access
- *
-@@ -105,7 +103,7 @@ class OC_Files {
+@@ -126,7 +124,7 @@ class OC_Files {
$xsendfile = false;
}
} else {
diff --git a/debian/patches/path/0005-Adapt-aws-sdk-path.patch b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
index 5cd2629..f261344 100644
--- a/debian/patches/path/0005-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0005-Adapt-aws-sdk-path.patch
@@ -12,10 +12,10 @@ Gbp: Topic path
1 file changed, 4 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
-index 4d94e35..3ceb17a 100644
+index acf976e..b22080a 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
-@@ -24,10 +24,6 @@
+@@ -34,10 +34,6 @@
namespace OC\Files\Storage;
diff --git a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
index ea92702..bcdf2a3 100644
--- a/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0006-Adapt-google-api-php-client-path.patch
@@ -14,21 +14,23 @@ Gbp: Topic path
2 files changed, 4 deletions(-)
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
-index b80f24b..fe88773 100644
+index acaf1b0..34cb21b 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
-@@ -1,6 +1,4 @@
- <?php
+@@ -24,8 +24,6 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
-set_include_path(get_include_path().PATH_SEPARATOR.
- \OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
require_once 'Google/Client.php';
OCP\JSON::checkAppEnabled('files_external');
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
-index bd9bdce..d5cb9cb 100644
+index 541113f..7cd3876 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
-@@ -21,8 +21,6 @@
+@@ -31,8 +31,6 @@
namespace OC\Files\Storage;
diff --git a/debian/patches/path/0007-Adapt-Dropbox-path.patch b/debian/patches/path/0007-Adapt-Dropbox-path.patch
index 5e1a3ed..2d6bad2 100644
--- a/debian/patches/path/0007-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0007-Adapt-Dropbox-path.patch
@@ -14,22 +14,23 @@ Gbp: Topic path
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
-index db417de..0fba990 100644
+index 495387b..c1d9be4 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
-@@ -1,6 +1,6 @@
- <?php
-
+@@ -24,7 +24,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
-require_once __DIR__ . '/../3rdparty/Dropbox/autoload.php';
+require_once 'Dropbox/autoload.php';
OCP\JSON::checkAppEnabled('files_external');
OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
-index 30ca431..89340f7 100644
+index b685f63..f606490 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
-@@ -22,7 +22,7 @@
+@@ -29,7 +29,7 @@
namespace OC\Files\Storage;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list