[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-68-g5e4d108

[David Prévot]

The following commit has been merged in the master branch:
commit 5e4d10838443687c1a6c4d05ac88593df2c567a4
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 1 19:22:22 2013 -0400

    Refresh existing patches

diff --git a/debian/patches/01_fix_data_path.diff b/debian/patches/01_fix_data_path.diff
index 37b56b8..95f602e 100644
--- a/debian/patches/01_fix_data_path.diff
+++ b/debian/patches/01_fix_data_path.diff
@@ -8,8 +8,7 @@ Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Bug-Debian: http://bugs.debian.org/648674
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-03-25
-
+Last-Update: 2013-04-01
 --- a/lib/config.php
 +++ b/lib/config.php
 @@ -130,12 +130,12 @@
@@ -109,7 +108,7 @@ Last-Update: 2013-03-25
              //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -200,7 +200,7 @@
+@@ -202,7 +202,7 @@
  		// set the right include path
  		set_include_path(
  			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
@@ -118,7 +117,7 @@ Last-Update: 2013-03-25
  				OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
  				implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
  				get_include_path() . PATH_SEPARATOR .
-@@ -209,8 +209,8 @@
+@@ -211,8 +211,8 @@
  	}
  
  	public static function checkConfig() {
@@ -184,7 +183,7 @@ Last-Update: 2013-03-25
  		}
 --- a/apps/user_ldap/user_ldap.php
 +++ b/apps/user_ldap/user_ldap.php
-@@ -199,7 +199,7 @@
+@@ -204,7 +204,7 @@
  					$homedir = $path;
  				} else {
  					$homedir = \OCP\Config::getSystemValue('datadirectory',
@@ -210,12 +209,12 @@ Last-Update: 2013-03-25
  $hasMSSQL = is_callable('sqlsrv_connect');
 -$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 +$datadir = OC_Config::getValue('datadirectory', '/var/lib/owncloud/data');
- 
- // Protect data directory here, so we can test if the protection is working
- OC_Setup::protectDataDirectory();
+ $vulnerableToNullByte = false;
+ if(file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
+ 	$vulnerableToNullByte = true;
 --- a/cron.php
 +++ b/cron.php
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
  
  if( OC::$CLI ) {
  	// Create lock file first
@@ -275,7 +274,7 @@ Last-Update: 2013-03-25
  			self::$logFile = $defaultLogFile;
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -832,8 +832,8 @@
+@@ -836,8 +836,8 @@
  	public static function protectDataDirectory() {
  		$content = "deny from all\n";
  		$content.= "IndexIgnore *";
diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 7458d94..cb7ccfc 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -3,10 +3,10 @@ Description: Disable the app store
 Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-03-25
+Last-Update: 2013-04-01
 --- a/lib/setup.php
 +++ b/lib/setup.php
-@@ -83,6 +83,8 @@
+@@ -87,6 +87,8 @@
  			OC_Config::setValue('datadirectory', $datadir);
  			OC_Config::setValue('dbtype', $dbtype);
  			OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
@@ -118,7 +118,7 @@ Last-Update: 2013-03-25
  				|| !is_readable(OC_App::getInstallPath()) ) {
 --- a/lib/base.php
 +++ b/lib/base.php
-@@ -177,8 +177,8 @@
+@@ -179,8 +179,8 @@
  					OC::$APPSROOTS[] = $paths;
  				}
  			}

-- 
owncloud.git