[Pkg-owncloud-commits] [owncloud] 252/258: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Sat Oct 11 17:22:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit bd4620155d42aa4a588d3de5dc71901b8ad8033f
Author: David Prévot <taffit at debian.org>
Date: Thu Oct 9 20:32:55 2014 -0400
Refresh patches
---
debian/patches/0001-Disable-the-appstore.patch | 120 ++++++++-------------
debian/patches/0002-Fix-displayed-version.patch | 30 +++---
debian/patches/0003-Improve-logfile-handling.patch | 36 +++++--
.../path/0004-Adapt-Archive-Tar.php-path.patch | 5 +-
...ctrine-Symphony-Patchwork-and-Pimple-path.patch | 5 +-
.../path/0006-Adapt-Crypt_Blowfish-path.patch | 3 +-
debian/patches/path/0007-Adapt-aws-sdk-path.patch | 2 +-
.../0008-Adapt-google-api-php-client-path.patch | 3 +-
debian/patches/path/0009-Adapt-Dropbox-path.patch | 3 +-
9 files changed, 98 insertions(+), 109 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 305b4b7..f6e89bb 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -12,39 +12,38 @@ Forwarded: not-needed
Reviewed-by: David Prévot <taffit at debian.org>
Last-Update: 2014-04-22
---
- config/config.sample.php | 11 +++++++----
- lib/base.php | 2 +-
- lib/private/app.php | 2 +-
- lib/private/ocsclient.php | 8 ++++----
- lib/private/setup.php | 2 ++
- lib/private/util.php | 2 +-
- settings/ajax/apps/ocs.php | 2 +-
- settings/templates/apps.php | 4 ++--
- 8 files changed, 19 insertions(+), 14 deletions(-)
+ config/config.sample.php | 8 +++++---
+ lib/base.php | 2 +-
+ lib/private/app.php | 2 +-
+ lib/private/ocsclient.php | 2 +-
+ lib/private/setup.php | 2 ++
+ lib/private/util.php | 2 +-
+ settings/ajax/apps/ocs.php | 2 +-
+ settings/templates/apps.php | 4 ++--
+ 8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 2aa240a..6ce5fdb 100644
+index ffbcbea..d200357 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -84,8 +84,10 @@ $CONFIG = array(
- /* Enable the help menu item in the settings */
- "knowledgebaseenabled" => true,
+@@ -492,8 +492,9 @@ $CONFIG = array(
--/* Enable installing apps from the appstore */
--"appstoreenabled" => true,
-+/* Enable installing apps from the appstore
-+ * DEBIAN: disabled by default, see /usr/share/doc/owncloud/README.Debian
-+ */
-+"appstoreenabled" => false,
+ /**
+ * When enabled, admins may install apps from the ownCloud app store.
++ * Debian: disabled by default, see /usr/share/doc/owncloud/README.Debian
+ */
+-'appstoreenabled' => true,
++'appstoreenabled' => false,
- /* URL of the appstore to use, server should understand OCS */
- "appstoreurl" => "https://api.owncloud.com/v1",
-@@ -240,11 +242,12 @@ $CONFIG = array(
- key 'path' is for the fs path and the key 'url' is for the http path to your
- applications paths. 'writable' indicates whether the user can install apps in this folder.
- You must have at least 1 app folder writable or you must set the parameter 'appstoreenabled' to false
-+ DEBIAN: disabled by default, see /usr/share/doc/owncloud/README.Debian
- */
+ /**
+ * The URL of the appstore to use.
+@@ -507,12 +508,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.
++ * Debian: disabled by default, see /usr/share/doc/owncloud/README.Debian
+ */
+ 'apps_paths' => array(
array(
- 'path'=> '/var/www/owncloud/apps',
+ 'path'=> '/usr/share/owncloud/apps',
@@ -53,9 +52,9 @@ index 2aa240a..6ce5fdb 100644
+ 'writable' => false,
),
),
- 'user_backends'=>array(
+
diff --git a/lib/base.php b/lib/base.php
-index ab3e34a..4c77549 100644
+index 7335be0..4bace86 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
@@ -68,10 +67,10 @@ index ab3e34a..4c77549 100644
OC::$APPSROOTS[] = array(
'path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps',
diff --git a/lib/private/app.php b/lib/private/app.php
-index 70f8980..47bff46 100644
+index a619504..5fd3610 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
-@@ -453,7 +453,7 @@ class OC_App {
+@@ -477,7 +477,7 @@ class OC_App {
* @return string
*/
public static function getInstallPath() {
@@ -81,51 +80,24 @@ index 70f8980..47bff46 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index e4cce6b..3a45167 100644
+index dc147de..52db11c 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
-@@ -64,7 +64,7 @@ class OC_OCSClient{
- * This function returns a list of all the application categories on the OCS server
- */
- public static function getCategories() {
-- if(OC_Config::getValue('appstoreenabled', true)==false) {
-+ if(OC_Config::getValue('appstoreenabled', false)==false) {
- return null;
- }
- $url=OC_OCSClient::getAppStoreURL().'/content/categories';
-@@ -100,7 +100,7 @@ class OC_OCSClient{
- * @param string $filter
+@@ -33,7 +33,7 @@ class OC_OCSClient{
+ * @return bool
*/
- public static function getApplications($categories, $page, $filter) {
-- if(OC_Config::getValue('appstoreenabled', true)==false) {
-+ if(OC_Config::getValue('appstoreenabled', false)==false) {
- return(array());
+ 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;
}
-@@ -155,7 +155,7 @@ class OC_OCSClient{
- * This function returns an applications from the OCS server
- */
- public static function getApplication($id) {
-- if(OC_Config::getValue('appstoreenabled', true)==false) {
-+ if(OC_Config::getValue('appstoreenabled', false)==false) {
- return null;
- }
- $url=OC_OCSClient::getAppStoreURL().'/content/data/'.urlencode($id);
-@@ -203,7 +203,7 @@ class OC_OCSClient{
- * @param integer $item
- */
- public static function getApplicationDownload($id, $item) {
-- if(OC_Config::getValue('appstoreenabled', true)==false) {
-+ if(OC_Config::getValue('appstoreenabled', false)==false) {
- return null;
- }
- $url=OC_OCSClient::getAppStoreURL().'/content/download/'.urlencode($id).'/'.urlencode($item);
diff --git a/lib/private/setup.php b/lib/private/setup.php
-index fdf98ab..88e9c21 100644
+index 2747922..377cf6a 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
-@@ -75,6 +75,8 @@ class OC_Setup {
- OC_Config::setValue('datadirectory', $datadir);
+@@ -85,6 +85,8 @@ class OC_Setup {
+ OC_Config::setValue('overwritewebroot', OC::$WEBROOT);
OC_Config::setValue('dbtype', $dbtype);
OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
+ OC_Config::setValue('appstoreenabled', false);
@@ -134,16 +106,16 @@ index fdf98ab..88e9c21 100644
$dbSetup->initialize($options);
$dbSetup->setupDatabase($username);
diff --git a/lib/private/util.php b/lib/private/util.php
-index 0696a79..c259d01 100644
+index 41311af..8a2b819 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -435,7 +435,7 @@ class OC_Util {
+@@ -437,7 +437,7 @@ class OC_Util {
}
// Check if there is a writable install folder.
-- if(OC_Config::getValue('appstoreenabled', true)) {
-+ if(OC_Config::getValue('appstoreenabled', false)) {
- if( OC_App::getInstallPath() === null
+- if ($config->getSystemValue('appstoreenabled', true)) {
++ if ($config->getSystemValue('appstoreenabled', false)) {
+ if (OC_App::getInstallPath() === null
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath()) ) {
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
@@ -160,7 +132,7 @@ index b68083f..844a43a 100644
}
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index 29fda0e..0d0724d 100644
+index 5199d3f..a5b4557 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -9,7 +9,7 @@
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index f37fa2a..2563e41 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -12,31 +12,29 @@ version is fixed to make it clear that’s a Debian package.
Forwarded: not-needed
Last-Update: 2013-10-17
---
- config/config.sample.php | 4 ++--
+ config/config.sample.php | 2 +-
lib/private/templatelayout.php | 2 +-
lib/private/util.php | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 6ce5fdb..31268f2 100644
+index d200357..0b12bed 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -156,8 +156,8 @@ $CONFIG = array(
- /* Check 3rdparty apps for malicious code fragments */
- "appcodechecker" => true,
-
--/* Check if ownCloud is up to date */
--"updatechecker" => true,
-+/* Check if ownCloud is up to date, useless in Debian since it’s handled via the package manager */
+@@ -377,7 +377,7 @@ $CONFIG = array(
+ * Check if ownCloud is up-to-date and shows a notification if a new version is
+ * available.
+ */
+-'updatechecker' => true,
+"updatechecker" => false,
- /* Are we connected to the internet or are we running in a closed network? */
- "has_internet_connection" => true,
+ /**
+ * 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 a5dd9a0..ccba321 100644
+index 2bd7f69..b2746f8 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
-@@ -29,7 +29,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -30,7 +30,7 @@ class OC_TemplateLayout extends OC_Template {
}
// Update notification
@@ -46,10 +44,10 @@ index a5dd9a0..ccba321 100644
if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
$this->assign('updateAvailable', true);
diff --git a/lib/private/util.php b/lib/private/util.php
-index c259d01..59a47e1 100644
+index 8a2b819..11cbd3f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1427,7 +1427,7 @@ class OC_Util {
+@@ -1304,7 +1304,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 82d1e0f..0610f07 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -8,23 +8,39 @@ Bug-Debian: http://bugs.debian.org/715484
Forwarded: not-needed
Last-Update: 2013-10-23
---
- config/config.sample.php | 2 +-
+ config/config.sample.php | 3 ++-
+ lib/base.php | 2 +-
lib/private/log/owncloud.php | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 31268f2..44686dc 100644
+index 0b12bed..4da99bb 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
-@@ -171,7 +171,7 @@ $CONFIG = array(
- /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
- "log_type" => "owncloud",
+@@ -413,8 +413,9 @@ $CONFIG = array(
--/* File for the owncloud logger to log to, (default is ownloud.log in the data dir) */
-+/* File for the owncloud logger to log to, (default is /var/log/ownloud.log in Debian) */
- "logfile" => "",
+ /**
+ * Change the ownCloud logfile name from ``owncloud.log`` to something else.
++ * Default is /var/log/ownloud.log in Debian.
+ */
+-'logfile' => 'owncloud.log',
++'logfile' => '/var/log/owncloud.log',
+
+ /**
+ * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
+diff --git a/lib/base.php b/lib/base.php
+index 4bace86..32224f9 100644
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -615,7 +615,7 @@ class OC {
+ if (OC_Config::getValue('installed', false) && OC_Config::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
+- \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
++ \OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue('logfile', '/var/log//owncloud.log'));
+ }
+ }
- /* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 08d0b7d..da9df3e 100644
--- a/lib/private/log/owncloud.php
diff --git a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
index 55fc9ba..9a7fda9 100644
--- a/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
+++ b/debian/patches/path/0004-Adapt-Archive-Tar.php-path.patch
@@ -10,13 +10,14 @@ them, i.e. php-pear.
Bug-Debian: http://bugs.debian.org/677159
Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-10-14
+Last-Update: 2014-10-09
+Gbp: Topic path
---
lib/private/archive/tar.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
-index 21a995d..5cb40e4 100644
+index 3f64b4c..7e30e7e 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -6,7 +6,7 @@
diff --git a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
index 320afec..cf9791c 100644
--- a/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
+++ b/debian/patches/path/0005-Adapt-Doctrine-Symphony-Patchwork-and-Pimple-path.patch
@@ -7,15 +7,14 @@ them, i.e. php-doctrine-common, php-doctrine-dbal, php-symfony-console,
php-symfony-routing, php-patchwork-utf8 and php-pimple.
Forwarded: not-needed
-Last-Update: 2014-06-15
-
+Last-Update: 2014-10-09
Gbp: Topic path
---
lib/base.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index 4c77549..bc12ee1 100644
+index 32224f9..1e77f4d8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -431,12 +431,12 @@ class OC {
diff --git a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
index 4ce81e7..9f4f163 100644
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
@@ -6,7 +6,8 @@ The Debian package depends on the needed classes instead of embedding
them, i.e. php-crypt-blowfish.
Forwarded: not-needed
-Last-Update: 2013-10-14
+Last-Update: 2014-10-09
+Gbp: Topic path
---
apps/files_encryption/lib/crypt.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/path/0007-Adapt-aws-sdk-path.patch b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
index 55b8b04..58a335e 100644
--- a/debian/patches/path/0007-Adapt-aws-sdk-path.patch
+++ b/debian/patches/path/0007-Adapt-aws-sdk-path.patch
@@ -12,7 +12,7 @@ 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 cfc9b51..da62a16 100644
+index bbb1b14..f3a5bd4 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -24,10 +24,6 @@
diff --git a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch b/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
index 3bc3a8e..2286d58 100644
--- a/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
+++ b/debian/patches/path/0008-Adapt-google-api-php-client-path.patch
@@ -6,7 +6,8 @@ The Debian package depends on the needed classes instead of embedding
them, i.e. php-google-api-php-client.
Forwarded: not-needed
-Last-Update: 2013-09-24
+Last-Update: 2014-10-09
+Gbp: Topic path
---
apps/files_external/ajax/google.php | 2 +-
apps/files_external/lib/google.php | 2 +-
diff --git a/debian/patches/path/0009-Adapt-Dropbox-path.patch b/debian/patches/path/0009-Adapt-Dropbox-path.patch
index 2075333..1ee9124 100644
--- a/debian/patches/path/0009-Adapt-Dropbox-path.patch
+++ b/debian/patches/path/0009-Adapt-Dropbox-path.patch
@@ -6,7 +6,8 @@ The Debian package depends on the needed classes instead of embedding
them, i.e. php-dropbox.
Forwarded: not-needed
-Last-Update: 2013-11-06
+Last-Update: 2014-10-09
+Gbp: Topic path
---
apps/files_external/ajax/dropbox.php | 2 +-
apps/files_external/lib/dropbox.php | 2 +-
--
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