[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.5-31-gb265ece

David Prévot taffit at debian.org
Sun Mar 24 01:26:50 UTC 2013


The following commit has been merged in the master branch:
commit 094e29b6003fe157740d923811af010239452fbe
Author: David Prévot <taffit at debian.org>
Date:   Sat Mar 23 17:04:17 2013 -0400

    Refresh existing patches

diff --git a/debian/changelog b/debian/changelog
index 9b8722b..593647a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
   * debian/repack.sh:
     - Remove incompatible docs from Font Awesome
     - Remove incompatible PDF from pdfjs
-  * debian/patches/04_add_onfontresize.diff: Add missing jquery.onfontresize
-    source
+  * debian/patches/:
+    - Refresh existing patches
+    - 04_add_onfontresize.diff: Add missing jquery.onfontresize source
   * debian/owncloud.links: Link to Zend Framework instead of embedding a
     partial copy
 
diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 6383bc0..4cc4a5a 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -4,16 +4,11 @@ Description: Path to data, config and backup folder changed
  In Debian we seperate the code (/usr/share/owncloud) from the 
  data (/var/lib/owncloud)
  Thanks to Jonathan Riddell <jriddell at ubuntu.com>
- .
- owncloud (2.0.0-1) unstable; urgency=low
- .
-   * Initial release (Closes: #648674)
 Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Bug-Debian: http://bugs.debian.org/648674
-
----
 Forwarded: not-needed
-Last-Update: <2011-11-16>
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-03-23
 
 --- a/lib/config.php
 +++ b/lib/config.php
@@ -21,62 +16,241 @@ Last-Update: <2011-11-16>
  			return true;
  		}
  
--		if( !file_exists( OC::$SERVERROOT."/config/config.php" )){
-+		if( !file_exists( "/etc/owncloud/config.php" )){
+-		if( !file_exists( OC::$SERVERROOT."/config/config.php" )) {
++		if( !file_exists( "/etc/owncloud/config.php" )) {
  			return false;
  		}
  
  		// Include the file, save the data from $CONFIG
--		include( OC::$SERVERROOT."/config/config.php" );
-+		include( "/etc/owncloud/config.php" );
- 		if( isset( $CONFIG ) && is_array( $CONFIG )){
+-		include OC::$SERVERROOT."/config/config.php";
++		include "/etc/owncloud/config.php";
+ 		if( isset( $CONFIG ) && is_array( $CONFIG )) {
  			self::$cache = $CONFIG;
  		}
-@@ -171,7 +171,7 @@
- 		$content .= ");\n?>\n";
+@@ -159,7 +159,7 @@
+ 		$content .= var_export(self::$cache, true);
+ 		$content .= ";\n";
  
+-		$filename = OC::$SERVERROOT."/config/config.php";
++		$filename = "/etc/owncloud/config.php";
  		// Write the file
--		$result=@file_put_contents( OC::$SERVERROOT."/config/config.php", $content );
-+		$result=@file_put_contents( "/etc/owncloud/config.php", $content );
+ 		$result=@file_put_contents( $filename, $content );
  		if(!$result) {
- 			$tmpl = new OC_Template( '', 'error', 'guest' );
- 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 --- a/lib/util.php
 +++ b/lib/util.php
-@@ -17,11 +17,11 @@
+@@ -36,7 +36,7 @@
+ 			self::$fsSetup=true;
+ 		}
+ 
+-		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
++		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+ 		//first set up the local "root" storage
+ 		if(!self::$rootMounted) {
+ 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
+@@ -198,7 +198,7 @@
+ 					.' to the apps directory in owncloud or disabling the appstore in the config file.');
+ 			}
+ 		}
+-		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
++		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+ 		// Create root dir.
+ 		if(!is_dir($CONFIG_DATADIRECTORY)) {
+ 			$success=@mkdir($CONFIG_DATADIRECTORY);
+@@ -527,7 +527,7 @@
+ 		$testcontent='testcontent';
+ 
+ 		// creating a test file
+-		$testfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ).'/'.$filename;
++		$testfile = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ).'/'.$filename;
+ 
+ 		if(file_exists($testfile)) {// already running this test, possible recursive call
  			return false;
+--- a/apps/updater/lib/helper.php
++++ b/apps/updater/lib/helper.php
+@@ -134,7 +134,7 @@
+ 	public static function filterLocations($locations, $basePath) {
+ 		$fullPath = array_values(self::getDirectories());
+ 		$fullPath[] = rtrim(App::getBackupBase(), '/');
+-		$fullPath[] = \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" );
++		$fullPath[] = \OC_Config::getValue( "datadirectory", \"/var/lib/owncloud/data" );
+ 		
+ 		$exclusions = array(
+ 			'full' => $fullPath,
+--- a/lib/MDB2/Driver/Manager/sqlite3.php
++++ b/lib/MDB2/Driver/Manager/sqlite3.php
+@@ -45,7 +45,7 @@
+      */
+     function createDatabase($name, $options = array())
+     {
+-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
++		$datadir=OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+         $db =$this->getDBInstance();
+         if (PEAR::isError($db)) {
+             return $db;
+--- a/lib/MDB2/Driver/sqlite3.php
++++ b/lib/MDB2/Driver/sqlite3.php
+@@ -326,7 +326,7 @@
+ 		if($this->connection instanceof SQLite3) {
+ 			return MDB2_OK;
  		}
+-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
++		$datadir=OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+         $database_file = $this->_getDatabaseFile($this->database_name);
+         if (is_resource($this->connection)) {
+             //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
+--- a/lib/base.php
++++ b/lib/base.php
+@@ -209,8 +209,8 @@
+ 	}
  
--		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
--		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" );
-+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
-+		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" );
- 
- 		// Check if config folder is writable.
--		if(!is_writable(OC::$SERVERROOT."/config/")) {
-+		if(!is_writable("/etc/owncloud/")) {
- 			$tmpl = new OC_Template( '', 'error', 'guest' );
- 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
- 			$tmpl->printPage();
-@@ -200,8 +200,8 @@
- 	 * @return array arrays with error messages and hints
- 	 */
- 	public static function checkServer(){
--		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
--		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" );
-+		$CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
-+		$CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" );
- 		$CONFIG_INSTALLED = OC_Config::getValue( "installed", false );
- 		$errors=array();
+ 	public static function checkConfig() {
+-		if (file_exists(OC::$SERVERROOT . "/config/config.php")
+-			and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
++		if (file_exists("/etc/owncloud/config.php")
++			and !is_writable("/etc/owncloud/config.php")) {
+ 			$tmpl = new OC_Template('', 'error', 'guest');
+ 			$tmpl->assign('errors', array(1 => array(
+ 				'error' => "Can't write into config directory 'config'",
+--- a/lib/migrate.php
++++ b/lib/migrate.php
+@@ -466,7 +466,7 @@
+ 		if(!self::$MDB2) {
+ 			require_once 'MDB2.php';
  
---- a/lib/setup.php
-+++ b/lib/setup.php
-@@ -3,7 +3,7 @@
- $hasSQLite = (is_callable('sqlite_open') or class_exists('SQLite3'));
- $hasMySQL = is_callable('mysql_connect');
+-			$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
++			$datadir = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" );
+ 
+ 			// DB type
+ 			if( class_exists( 'SQLite3' ) ) {
+--- a/lib/user.php
++++ b/lib/user.php
+@@ -223,7 +223,7 @@
+ 			OC_Preferences::deleteUser($uid);
+ 
+ 			// Delete user files in /data/
+-			OC_Helper::rmdirr(OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/'.$uid.'/');
++			OC_Helper::rmdirr(OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) . '/'.$uid.'/');
+ 
+ 			// Emit and exit
+ 			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
+@@ -495,7 +495,7 @@
+ 				}
+ 			}
+ 		}
+-		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
++		return OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $uid;
+ 	}
+ 
+ 	/**
+--- a/lib/user/database.php
++++ b/lib/user/database.php
+@@ -253,7 +253,7 @@
+ 	*/
+ 	public function getHome($uid) {
+ 		if($this->userExists($uid)) {
+-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
++			return OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $uid;
+ 		}else{
+ 			return false;
+ 		}
+--- a/lib/user/http.php
++++ b/lib/user/http.php
+@@ -98,7 +98,7 @@
+ 	*/
+ 	public function getHome($uid) {
+ 		if($this->userExists($uid)) {
+-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
++			return OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $uid;
+ 		}else{
+ 			return false;
+ 		}
+--- a/apps/user_ldap/user_ldap.php
++++ b/apps/user_ldap/user_ldap.php
+@@ -199,7 +199,7 @@
+ 					$homedir = $path;
+ 				} else {
+ 					$homedir = \OCP\Config::getSystemValue('datadirectory',
+-						\OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
++						\'/var/lib/owncloud/data' ) . '/' . $homedir[0];
+ 				}
+ 				$this->connection->writeToCache($cacheKey, $homedir);
+ 				return $homedir;
+--- a/core/setup.php
++++ b/core/setup.php
+@@ -17,7 +17,7 @@
  $hasPostgreSQL = is_callable('pg_connect');
+ $hasOracle = is_callable('oci_connect');
+ $hasMSSQL = is_callable('sqlsrv_connect');
 -$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 +$datadir = OC_Config::getValue('datadirectory', '/var/lib/owncloud/data');
- $opts = array(
- 	'hasSQLite' => $hasSQLite,
- 	'hasMySQL' => $hasMySQL,
+ 
+ // Protect data directory here, so we can test if the protection is working
+ OC_Setup::protectDataDirectory();
+--- a/cron.php
++++ b/cron.php
+@@ -74,7 +74,7 @@
+ 
+ if( OC::$CLI ) {
+ 	// Create lock file first
+-	my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ).'/cron.lock';
++	my_temporary_cron_class::$lockfile = OC_Config::getValue( "datadirectory", '/var/lib/owncloud/data' ).'/cron.lock';
+ 	
+ 	// We call ownCloud from the CLI (aka cron)
+ 	if( $appmode != 'cron' ) {
+--- a/lib/db.php
++++ b/lib/db.php
+@@ -137,7 +137,7 @@
+ 			$port=false;
+ 		}
+ 		$opts = array();
+-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
++		$datadir=OC_Config::getValue( "datadirectory", '/var/lib/owncloud/data' );
+ 
+ 		// do nothing if the connection already has been established
+ 		if(!self::$PDO) {
+--- a/lib/files/filesystem.php
++++ b/lib/files/filesystem.php
+@@ -221,7 +221,7 @@
+ 
+ 		$root = \OC_User::getHome($user);
+ 		self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
+-		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
++		$datadir = \OC_Config::getValue("datadirectory", \"/var/lib/owncloud/data");
+ 
+ 		//move config file to it's new position
+ 		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
+--- a/lib/log/owncloud.php
++++ b/lib/log/owncloud.php
+@@ -33,7 +33,7 @@
+ 	 * Init class data
+ 	 */
+ 	public static function init() {
+-		$defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
++		$defaultLogFile = OC_Config::getValue("datadirectory", '/var/lib/owncloud/data').'/owncloud.log';
+ 		self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+ 		if (!file_exists(self::$logFile)) {
+ 			self::$logFile = $defaultLogFile;
+--- a/lib/setup.php
++++ b/lib/setup.php
+@@ -832,8 +832,8 @@
+ 	public static function protectDataDirectory() {
+ 		$content = "deny from all\n";
+ 		$content.= "IndexIgnore *";
+-		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.htaccess', $content);
+-		file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/index.html', '');
++		file_put_contents(OC_Config::getValue('datadirectory', '/var/lib/owncloud/data').'/.htaccess', $content);
++		file_put_contents(OC_Config::getValue('datadirectory', '/var/lib/owncloud/data').'/index.html', '');
+ 	}
+ 
+ 	/**
+--- a/apps/updater/appinfo/app.php
++++ b/apps/updater/appinfo/app.php
+@@ -31,7 +31,7 @@
+ 	 * @return string
+ 	 */
+ 	public static function getBackupBase() {
+-		return \OC::$SERVERROOT . '/backup/';
++		return \'/var/lib/owncloud/backup';
+ 	}
+ 
+ 	public static function getSource($url, $version) {
diff --git a/debian/patches/03_fix_phpmailer.diff b/debian/patches/03_fix_phpmailer.diff
index 24a390c..5cb37fb 100644
--- a/debian/patches/03_fix_phpmailer.diff
+++ b/debian/patches/03_fix_phpmailer.diff
@@ -3,15 +3,16 @@ Description: Path to class.phpmailer.php is different
   The path is different and must be changed.
 Author: Paul van Tilburg <paulvt at debian.org>
 Forwarded: not-needed
-
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-03-23
 --- a/lib/mail.php
 +++ b/lib/mail.php
 @@ -12,7 +12,7 @@
   * A class to handle mail sending.
   */
  
--require_once('class.phpmailer.php');
-+require_once('libphp-phpmailer/class.phpmailer.php');
+-require_once 'class.phpmailer.php';
++require_once 'libphp-phpmailer/class.phpmailer.php';
  
  class OC_Mail {
  
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index ce09e9a..5bf97e7 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -2,63 +2,105 @@ Description: Disable the app store
  Due to the potential injection of malicious code the app store is disabled
 Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Forwarded: not-needed
-
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-03-23
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -81,6 +81,8 @@
+@@ -83,6 +83,8 @@
  			OC_Config::setValue('datadirectory', $datadir);
-  			OC_Config::setValue('dbtype', $dbtype);
-  			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+ 			OC_Config::setValue('dbtype', $dbtype);
+ 			OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 +			OC_Config::setValue('appstoreenabled', false);
-+			OC_Config::setValue('writable_appsdir', false);
++			OC_Config::setValue('apps_paths', array('writable' => false));
  			if($dbtype == 'mysql') {
  				$dbuser = $options['dbuser'];
  				$dbpass = $options['dbpass'];
---- a/lib/util.php
-+++ b/lib/util.php
-@@ -29,7 +29,7 @@
- 		}
- 
- 		// Check if apps folder is writable.
--		if(OC_Config::getValue('writable_appsdir', true) && !is_writable(OC::$SERVERROOT."/apps/")) {
-+		if(OC_Config::getValue('writable_appsdir', false) && !is_writable(OC::$SERVERROOT."/apps/")) {
- 			$tmpl = new OC_Template( '', 'error', 'guest' );
- 			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into apps directory 'apps'",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory in owncloud")));
- 			$tmpl->printPage();
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -31,8 +31,10 @@
- "knowledgebaseenabled" => true,
+@@ -71,8 +71,10 @@
  /* URL to use for the help page, server should understand OCS */
  "knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
+ 
 -/* 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,
+ 
  /* URL of the appstore to use, server should understand OCS */
  "appstoreurl" => "http://api.apps.owncloud.com/v1",
- /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
-@@ -60,8 +62,9 @@
- /* Set this to false to disable the check for writable apps dir.
-  * If the apps dir is not writable, you can't download&install extra apps
-  * in the admin apps menu.
-+ * DEBIAN: disabled by default, see /usr/share/doc/owncloud/README.Debian
-  */
--"writable_appsdir" => true,
-+"writable_appsdir" => false,
- /* The directory where the user data is stored, default to data in the owncloud
-  * directory. The sqlite database is also stored here, when sqlite is used.
-  */
+@@ -152,11 +154,12 @@
+  key 'path' is for the fs path and the key 'url' is for the http path to your
+  applications paths. 'writable' indicate if 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
+ */
+ 	array(
+ 		'path'=> '/var/www/owncloud/apps',
+ 		'url' => '/apps',
+-		'writable' => true,
++		'writable' => false,
+ 	),
+ ),
+ 'user_backends'=>array(
 --- a/lib/ocsclient.php
 +++ b/lib/ocsclient.php
-@@ -96,7 +96,7 @@
+@@ -68,7 +68,7 @@
+ 	 * 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';
+@@ -99,7 +99,7 @@
  	 * This function returns a list of all the applications on the OCS server
  	 */
- 	public static function getApplications($categories,$page){
--		if(OC_Config::getValue('appstoreenabled', true)==false){
-+		if(OC_Config::getValue('appstoreenabled', false)==false){
+ 	public static function getApplications($categories, $page, $filter) {
+-		if(OC_Config::getValue('appstoreenabled', true)==false) {
++		if(OC_Config::getValue('appstoreenabled', false)==false) {
  			return(array());
  		}
  
+@@ -151,7 +151,7 @@
+ 	 * 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);
+@@ -191,7 +191,7 @@
+ 		* This function returns an download url for an applications from the OCS server
+ 		*/
+ 	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);
+--- a/lib/app.php
++++ b/lib/app.php
+@@ -433,7 +433,7 @@
+ 	 * Get the path where to install apps
+ 	 */
+ 	public static function getInstallPath() {
+-		if(OC_Config::getValue('appstoreenabled', true)==false) {
++		if(OC_Config::getValue('appstoreenabled', false)==false) {
+ 			return false;
+ 		}
+ 
+--- a/settings/ajax/apps/ocs.php
++++ b/settings/ajax/apps/ocs.php
+@@ -10,7 +10,7 @@
+ 
+ $l = OC_L10N::get('settings');
+ 
+-if(OC_Config::getValue('appstoreenabled', true)==false) {
++if(OC_Config::getValue('appstoreenabled', false)==false) {
+ 	OCP\JSON::success(array('type' => 'external', 'data' => array()));
+ }
+ 
diff --git a/debian/patches/fix_tar_require.diff b/debian/patches/fix_tar_require.diff
index 68fd907..b34fc0f 100644
--- a/debian/patches/fix_tar_require.diff
+++ b/debian/patches/fix_tar_require.diff
@@ -4,17 +4,15 @@ Description: Path to Archive/Tar.php is different
   3rdparty/ directory which is not available in the package.
 Author: Paul van Tilburg <paulvt at debian.org>
 Bug-Debian: http://bugs.debian.org/677159
-
----
-Last-Update: <2012-06-12>
-
+Reviewed-by: David Prévot <taffit at debian.org>
+Last-Update: 2013-03-23
 --- a/lib/archive/tar.php
 +++ b/lib/archive/tar.php
 @@ -6,7 +6,7 @@
   * See the COPYING-README file.
   */
  
--require_once '3rdparty/Archive/Tar.php';
+-require_once OC::$THIRDPARTYROOT . '/3rdparty/Archive/Tar.php';
 +require_once 'Archive/Tar.php';
  
  class OC_Archive_TAR extends OC_Archive{

-- 
owncloud.git



More information about the Pkg-owncloud-commits mailing list