Hi Paul, On 11/06/2012 03:45 PM, Paul van Tilburg wrote: > On Mon, Nov 05, 2012 at 04:45:06PM +0100, Jean Charles Delépine wrote: >> For my own needs I've made my own owncloud 4.5.1a debian packages. >> >> If one want to have a look at it. >> >> http://debian-upjv.u-picardie.fr/laurent/pool/owncloud/ >> >> As always, no garanties, will make your hairs fall, ... > > I can make the debdiff, but am generally interested in the changes > you have made.
the interdiff is attached: changelog | 36 ++++ control | 1 copyright | 11 - owncloud.README.Debian | 2 owncloud.install | 4 patches/01_fix_data_path.diff | 316 ++++++++++++++++++++++++++++++++++++------ patches/02_fix_crypt.diff | 10 - patches/03_fix_phpmailer.diff | 10 - patches/05_no_app_store.diff | 148 +++++++++++++------ patches/series | 3 repack.sh | 3 rules | 10 - 12 files changed, 439 insertions(+), 115 deletions(-) > I have imported 4.5.1 into our Git repository and this can go to > experimental. However, when I inspected the diff between (tags) > upstream/4.0.8debian and upstream/4.5.1+debian, I got a diff of over > 500,000 lines (yes, really). Most of this pertains to translation, but > still quite some files are added to the 3rdparty/ folder which means we > need a big update of debian/copyright again. This is going to take > quite some time, unfortunately. > > I wanted to explain this, because I see that many people are eager to > get their hands on 4.5.1, but it's just more work than import upstream, > build and push. Given that Thomas and I have little time at the moment, > this makes it go slower than you guys would want. Any help is > appreciated though. Maybe I should upload preliminary packages again? Indeed ... maybe the interdiff make things easier for you. I was looking into it yesterday and it looks like the changelog isn't very verbose. :) HTH. Cheers, Jan. -- Never write mail to <[email protected]>, you have been warned! -----BEGIN GEEK CODE BLOCK----- Version: 3.12 GIT d-- s+: a C+++ UL++++ P+ L+++ E--- W+++ N+++ o++ K++ w--- O M V- PS PE Y++ PGP++ t-- 5 X R tv- b+ DI D+ G++ e++ h---- r+++ y++++ ------END GEEK CODE BLOCK------
diff -Nur debian.orig//changelog debian//changelog --- debian.orig//changelog 2012-10-11 14:45:06.000000000 +0200 +++ debian//changelog 2012-11-03 13:16:39.000000000 +0100 @@ -1,3 +1,39 @@ +owncloud (4.5.1debian-0.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * New upstream release + * debian/patches: + - Adjust 01_fix_data_path.diff + * Add 3rdparty/mediawiki files, Conflicts: mediawiki + * Add experimental feature 'files_external' 'smb4php" + + -- Jean Charles Delepine <[email protected]> Wed, 24 Oct 2012 17:15:58 +0200 + +owncloud (4.5.0debian-0.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * New upstream major release + * debian/patches: + - Adjust 01_fix_data_path.diff + - Adjust 02_fix_crypt.diff + - Adjust 03_fix_phpmailer.diff + - Adjust 05_no_app_store.diff + - appstoreenabled defaults to false + - Removed patches fix_tar_require.diff fix_sabre_requires.diff fix_config.php_mode.diff + * debian/copyright: + - Remove when + - Remove pdfjs + - add miniColors + * debian/owncloud.install: + - Remove 3rdparty/when + - Add miniColors + * debian/rules: + - jquery.inview is now in core/ not apps/ + - Remove pdfjs + - add miniColors + + -- Jean Charles Delepine <[email protected]> Mon, 22 Oct 2012 19:02:35 +0200 + owncloud (4.0.8debian-1) unstable; urgency=low * New upstream bugfix release diff -Nur debian.orig//control debian//control --- debian.orig//control 2012-07-19 12:56:49.000000000 +0200 +++ debian//control 2012-11-03 13:16:21.000000000 +0100 @@ -20,6 +20,7 @@ owncloud-mysql (= ${source:Version}) | owncloud-sqlite (= ${source:Version}), libjs-jquery (>= 1.7.2-1), libjs-jquery-ui, libjs-jquery-jplayer Recommends: exim4 | mail-transport-agent +Conflicts: mediawiki Description: cloud storage for files, music, contacts, calendars and many more ownCloud gives you universal access to your files through a web interface or WebDAV. It also provides a platform to easily view & sync your diff -Nur debian.orig//copyright debian//copyright --- debian.orig//copyright 2012-10-11 14:17:06.000000000 +0200 +++ debian//copyright 2012-10-27 18:07:05.000000000 +0200 @@ -180,10 +180,13 @@ License: Expat or GPL-2 Comment: Expat license referred to as MIT license. -Files: 3rdparty/when/* -Copyright: 2010, Tomhas Planer <[email protected]> -License: Expat -Comment: Expat license referred to as MIT license. +files: 3rdparty/miniColors/* +Copyright: 2011 Cory LaViska for A Beautiful Site, LLC. (http://abeautifulsite.net/) +License: MIT or GPL-2 + +files: 3rdparty/smb4php/smb.php +Copyrighti: (c) 2007 Victor M. Varela <[email protected]> +License: GPL-2+ Files: apps/calendar/img/* Copyright: 2010, The Noun Project diff -Nur debian.orig//owncloud.install debian//owncloud.install --- debian.orig//owncloud.install 2012-06-13 22:58:46.000000000 +0200 +++ debian//owncloud.install 2012-11-03 13:08:55.000000000 +0100 @@ -17,7 +17,9 @@ 3rdparty/php-cloudfiles /usr/share/owncloud/3rdparty 3rdparty/phpass /usr/share/owncloud/3rdparty 3rdparty/timepicker /usr/share/owncloud/3rdparty -3rdparty/when /usr/share/owncloud/3rdparty +3rdparty/miniColors /usr/share/owncloud/3rdparty +3rdparty/smb4php/ /usr/share/owncloud/3rdparty +3rdparty/mediawiki/ /usr/share/owncloud/3rdparty # Files. db_structure.xml /usr/share/owncloud diff -Nur debian.orig//owncloud.README.Debian debian//owncloud.README.Debian --- debian.orig//owncloud.README.Debian 2012-07-19 12:56:49.000000000 +0200 +++ debian//owncloud.README.Debian 2012-10-23 12:16:35.000000000 +0200 @@ -35,8 +35,6 @@ /etc/owncloud/config.php. This is because the "apps" directory is not writable by the ownCloud web application as the contents of /usr/share/owncloud/apps are part of this Debian package. -The default of false for the "writable_appsdir" key ensures that the -directory is also not checked for writability. Theming ------- diff -Nur debian.orig//patches/01_fix_data_path.diff debian//patches/01_fix_data_path.diff --- debian.orig//patches/01_fix_data_path.diff 2012-06-13 22:58:46.000000000 +0200 +++ debian//patches/01_fix_data_path.diff 2012-10-24 17:44:38.000000000 +0200 @@ -15,68 +15,300 @@ Forwarded: not-needed Last-Update: <2011-11-16> ---- a/lib/config.php -+++ b/lib/config.php +Index: owncloud-4.5.1debian/lib/config.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/config.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/config.php 2012-10-24 17:43:34.378855673 +0200 @@ -130,12 +130,12 @@ 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 @@ - return false; +Index: owncloud-4.5.1debian/lib/util.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/util.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/util.php 2012-10-24 17:43:34.406855374 +0200 +@@ -31,7 +31,7 @@ + self::$fsSetup=true; } -- $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_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_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/'); +@@ -220,7 +220,7 @@ + $permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory"; // 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(); - ---- a/lib/setup.php -+++ b/lib/setup.php -@@ -3,7 +3,7 @@ - $hasSQLite = (is_callable('sqlite_open') or class_exists('SQLite3')); +- if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) { ++ if(!is_writable("/etc/owncloud") or !is_readable("/etc/owncloud")) { + $errors[]=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"); + } + +@@ -232,7 +232,7 @@ + } + } + +- $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); ++ $CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ); + //check for correct file permissions + if(!stristr(PHP_OS, 'WIN')) { + $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users."; +@@ -246,7 +246,7 @@ + } + } + if( OC_Config::getValue( "enablebackup", false )) { +- $CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", OC::$SERVERROOT."/backup" ); ++ $CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "/var/lib/owncloud/backup" ); + $prems=substr(decoct(@fileperms($CONFIG_BACKUPDIRECTORY)),-3); + if(substr($prems,-1)!='0') { + OC_Helper::chmodr($CONFIG_BACKUPDIRECTORY,0770); +@@ -540,7 +540,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; + $fp = @fopen($testfile, 'w'); + @fwrite($fp, $testcontent); + @fclose($fp); +Index: owncloud-4.5.1debian/lib/setup.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/setup.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/setup.php 2012-10-24 17:44:32.922232912 +0200 +@@ -4,11 +4,11 @@ $hasMySQL = is_callable('mysql_connect'); $hasPostgreSQL = is_callable('pg_connect'); + $hasOracle = is_callable('oci_connect'); -$datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data'); +$datadir = OC_Config::getValue('datadirectory', '/var/lib/owncloud/data'); + + // Test if .htaccess is working + $content = "deny from all"; +-file_put_contents(OC::$SERVERROOT.'/data/.htaccess', $content); ++file_put_contents('/var/lib/owncloud/data/.htaccess', $content); + $opts = array( 'hasSQLite' => $hasSQLite, - 'hasMySQL' => $hasMySQL, +@@ -575,11 +575,11 @@ + $content.= "RewriteRule ^remote/(.*) remote.php [QSA,L]\n"; + $content.= "</IfModule>\n"; + $content.= "Options -Indexes\n"; +- @file_put_contents(OC::$SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it ++ @file_put_contents('/var/lib/owncloud/.htaccess', $content); //supress errors in case we don't have permissions for it + + $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', ''); + } + } +Index: owncloud-4.5.1debian/lib/base.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/base.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/base.php 2012-10-24 17:43:34.410855331 +0200 +@@ -171,7 +171,7 @@ + // set the right include path + set_include_path( + OC::$SERVERROOT.'/lib'.PATH_SEPARATOR. +- OC::$SERVERROOT.'/config'.PATH_SEPARATOR. ++ '/etc/owncloud'.PATH_SEPARATOR. + OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR. + implode($paths,PATH_SEPARATOR).PATH_SEPARATOR. + get_include_path().PATH_SEPARATOR. +@@ -214,7 +214,7 @@ + echo 'Error while upgrading the database'; + die(); + } +- 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'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud"))); + $tmpl->printPage(); +@@ -419,7 +419,7 @@ + public static function handleRequest() { + if (!OC_Config::getValue('installed', false)) { + // Check for autosetup: +- $autosetup_file = OC::$SERVERROOT."/config/autoconfig.php"; ++ $autosetup_file = "/etc/owncloud/autoconfig.php"; + if( file_exists( $autosetup_file )) { + OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', OC_Log::INFO); + include $autosetup_file; +Index: owncloud-4.5.1debian/lib/migrate.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/migrate.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/migrate.php 2012-10-24 17:43:34.410855331 +0200 +@@ -467,7 +467,7 @@ + if(!self::$MDB2) { + require_once 'MDB2.php'; + +- $datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); ++ $datadir = OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ); + + // DB type + if( class_exists( 'SQLite3' ) ) { +Index: owncloud-4.5.1debian/lib/log/owncloud.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/log/owncloud.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/log/owncloud.php 2012-10-24 17:43:34.410855331 +0200 +@@ -33,7 +33,7 @@ + * Init class data + */ + public static function init() { +- $datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' ); ++ $datadir=OC_Config::getValue( "datadirectory", '/var/lib/owncloud/data' ); + self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' ); + } + +Index: owncloud-4.5.1debian/lib/user.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/user.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/user.php 2012-10-24 17:43:34.410855331 +0200 +@@ -379,7 +379,7 @@ + } + } + } +- return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid; ++ return OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $uid; + } + + /** +Index: owncloud-4.5.1debian/lib/user/http.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/user/http.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/user/http.php 2012-10-24 17:43:34.414855290 +0200 +@@ -98,9 +98,9 @@ + */ + 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; + } + } +-} +\ No newline at end of file ++} +Index: owncloud-4.5.1debian/lib/user/database.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/user/database.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/user/database.php 2012-10-24 17:43:34.414855290 +0200 +@@ -183,7 +183,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; + } +Index: owncloud-4.5.1debian/lib/db.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/db.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/db.php 2012-10-24 17:43:34.414855290 +0200 +@@ -120,7 +120,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) { +@@ -196,7 +196,7 @@ + $pass = OC_Config::getValue( "dbpassword", "" ); + $type = OC_Config::getValue( "dbtype", "sqlite" ); + $SERVERROOT=OC::$SERVERROOT; +- $datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" ); ++ $datadir=OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ); + + // do nothing if the connection already has been established + if(!self::$MDB2) { +Index: owncloud-4.5.1debian/apps/updater/appinfo/app.php +=================================================================== +--- owncloud-4.5.1debian.orig/apps/updater/appinfo/app.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/apps/updater/appinfo/app.php 2012-10-24 17:43:34.414855290 +0200 +@@ -43,7 +43,7 @@ + return array( + 'full' => array( + rtrim(self::getBackupBase(), DIRECTORY_SEPARATOR), +- \OC_Config::getValue( "datadirectory", \OC::$SERVERROOT."/data" ) ++ \OC_Config::getValue( "datadirectory", "/var/lib/owncloud/data" ) + ), + 'relative' => array('.', '..') + ); +Index: owncloud-4.5.1debian/apps/user_ldap/user_ldap.php +=================================================================== +--- owncloud-4.5.1debian.orig/apps/user_ldap/user_ldap.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/apps/user_ldap/user_ldap.php 2012-10-24 17:43:34.414855290 +0200 +@@ -173,14 +173,14 @@ + $attr = substr($this->connection->homeFolderNamingRule, strlen('attr:')); + $homedir = $this->readAttribute($this->username2dn($uid), $attr); + if($homedir) { +- $homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $homedir[0]; ++ $homedir = \OCP\Config::getSystemValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $homedir[0]; + \OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir); + return $homedir; + } + } + + //fallback and default: username +- $homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $uid; ++ $homedir = \OCP\Config::getSystemValue( "datadirectory", "/var/lib/owncloud/data" ) . '/' . $uid; + \OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir); + return $homedir; + } +@@ -213,4 +213,4 @@ + return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions); + } + +-} +\ No newline at end of file ++} +Index: owncloud-4.5.1debian/lib/filesystem.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/filesystem.php 2012-10-24 17:43:08.459131091 +0200 ++++ owncloud-4.5.1debian/lib/filesystem.php 2012-10-24 17:43:34.414855290 +0200 +@@ -209,8 +209,8 @@ + } + + static private function loadSystemMountPoints($user) { +- if(is_file(OC::$SERVERROOT.'/config/mount.php')) { +- $mountConfig=include(OC::$SERVERROOT.'/config/mount.php'); ++ if(is_file('/etc/owncloud/mount.php')) { ++ $mountConfig=include('/etc/owncloud/mount.php'); + if(isset($mountConfig['global'])) { + foreach($mountConfig['global'] as $mountPoint=>$options) { + self::mount($options['class'],$options['options'],$mountPoint); +@@ -245,7 +245,7 @@ + } + } + +- $mtime=filemtime(OC::$SERVERROOT.'/config/mount.php'); ++ $mtime=filemtime('/etc/owncloud/mount.php'); + $previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0); + if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated + OC_FileCache::triggerUpdate(); diff -Nur debian.orig//patches/02_fix_crypt.diff debian//patches/02_fix_crypt.diff --- debian.orig//patches/02_fix_crypt.diff 2012-06-11 14:01:26.000000000 +0200 +++ debian//patches/02_fix_crypt.diff 2012-10-22 17:07:26.000000000 +0200 @@ -12,14 +12,16 @@ Forwarded: not-needed Last-Update: <2011-11-17> ---- a/apps/files_encryption/lib/crypt.php -+++ b/apps/files_encryption/lib/crypt.php +Index: owncloud-4.5.0debian.orig/apps/files_encryption/lib/crypt.php +=================================================================== +--- owncloud-4.5.0debian.orig.orig/apps/files_encryption/lib/crypt.php 2012-10-10 15:21:20.000000000 +0200 ++++ owncloud-4.5.0debian.orig/apps/files_encryption/lib/crypt.php 2012-10-22 17:07:18.498949992 +0200 @@ -31,7 +31,7 @@ // - IMPORTANT! Check if the block lenght of the encrypted data stays the same --require_once('Crypt_Blowfish/Blowfish.php'); -+require_once('Crypt/Blowfish.php'); +-require_once 'Crypt_Blowfish/Blowfish.php'; ++require_once 'Crypt/Blowfish.php'; /** * This class is for crypting and decrypting diff -Nur debian.orig//patches/03_fix_phpmailer.diff debian//patches/03_fix_phpmailer.diff --- debian.orig//patches/03_fix_phpmailer.diff 2012-06-11 14:01:26.000000000 +0200 +++ debian//patches/03_fix_phpmailer.diff 2012-10-22 17:09:05.000000000 +0200 @@ -4,14 +4,16 @@ Author: Paul van Tilburg <[email protected]> Forwarded: not-needed ---- a/lib/mail.php -+++ b/lib/mail.php +Index: owncloud-4.5.0debian.orig/lib/mail.php +=================================================================== +--- owncloud-4.5.0debian.orig.orig/lib/mail.php 2012-10-10 15:21:20.000000000 +0200 ++++ owncloud-4.5.0debian.orig/lib/mail.php 2012-10-22 17:09:02.357245037 +0200 @@ -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 -Nur debian.orig//patches/05_no_app_store.diff debian//patches/05_no_app_store.diff --- debian.orig//patches/05_no_app_store.diff 2012-10-11 14:37:17.000000000 +0200 +++ debian//patches/05_no_app_store.diff 2012-11-03 13:34:51.000000000 +0100 @@ -3,62 +3,116 @@ Author: Thomas Mueller <[email protected]> Forwarded: not-needed ---- a/lib/setup.php -+++ b/lib/setup.php -@@ -81,6 +81,8 @@ - OC_Config::setValue('datadirectory', $datadir); - OC_Config::setValue('dbtype', $dbtype); - OC_Config::setValue('version',implode('.',OC_Util::getVersion())); -+ OC_Config::setValue('appstoreenabled', false); -+ OC_Config::setValue('writable_appsdir', 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, - /* URL to use for the help page, server should understand OCS */ +Index: owncloud-4.5.1debian/config/config.sample.php +=================================================================== +--- owncloud-4.5.1debian.orig/config/config.sample.php 2012-10-24 18:29:16.000000000 +0200 ++++ owncloud-4.5.1debian/config/config.sample.php 2012-10-25 16:16:13.867288312 +0200 +@@ -49,7 +49,9 @@ "knowledgebaseurl" => "http://api.apps.owncloud.com/v1";, --/* Enable installing apps from the appstore */ + + /* 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. - */ ---- a/lib/ocsclient.php -+++ b/lib/ocsclient.php -@@ -96,7 +96,7 @@ +@@ -97,11 +99,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', ++ 'path'=> '/usr/share/owncloud/apps', + 'url' => '/apps', +- 'writable' => true, ++ 'writable' => false, + ), + ), +-); +\ No newline at end of file ++); +Index: owncloud-4.5.1debian/lib/base.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/base.php 2012-10-25 16:16:13.831289798 +0200 ++++ owncloud-4.5.1debian/lib/base.php 2012-11-03 13:34:43.863914499 +0100 +@@ -154,8 +154,8 @@ + OC::$APPSROOTS[] = $paths; + } + } +- }elseif(file_exists(OC::$SERVERROOT.'/apps')) { +- OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true); ++ }elseif(file_exists('/usr/share/owncloud/apps')) { ++ OC::$APPSROOTS[] = array('path'=> '/usr/share/owncloud/apps', 'url' => '/apps', 'writable' => false); + }elseif(file_exists(OC::$SERVERROOT.'/../apps')) { + OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps', 'writable' => true); + } +Index: owncloud-4.5.1debian/lib/util.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/util.php 2012-10-25 16:16:13.831289798 +0200 ++++ owncloud-4.5.1debian/lib/util.php 2012-10-25 16:16:13.867288312 +0200 +@@ -225,7 +225,7 @@ + } + + // 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 || !is_writable(OC_App::getInstallPath()) || !is_readable(OC_App::getInstallPath()) ) { + $errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory + in owncloud or disabling the appstore in the config file."); +Index: owncloud-4.5.1debian/lib/app.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/app.php 2012-10-24 18:29:16.000000000 +0200 ++++ owncloud-4.5.1debian/lib/app.php 2012-10-25 16:16:13.867288312 +0200 +@@ -337,7 +337,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; + } + +Index: owncloud-4.5.1debian/lib/ocsclient.php +=================================================================== +--- owncloud-4.5.1debian.orig/lib/ocsclient.php 2012-10-24 18:29:16.000000000 +0200 ++++ owncloud-4.5.1debian/lib/ocsclient.php 2012-10-25 16:16:13.867288312 +0200 +@@ -75,7 +75,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'; +@@ -106,7 +106,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()); } +@@ -155,7 +155,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); +@@ -193,7 +193,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); diff -Nur debian.orig//patches/series debian//patches/series --- debian.orig//patches/series 2012-10-11 14:17:07.000000000 +0200 +++ debian//patches/series 2012-10-22 18:55:39.000000000 +0200 @@ -2,7 +2,4 @@ 02_fix_crypt.diff 03_fix_phpmailer.diff 05_no_app_store.diff -fix_tar_require.diff -fix_sabre_requires.diff -fix_config.php_mode.diff diff -Nur debian.orig//repack.sh debian//repack.sh --- debian.orig//repack.sh 2012-09-05 23:42:47.000000000 +0200 +++ debian//repack.sh 2012-10-27 17:17:08.000000000 +0200 @@ -34,9 +34,6 @@ # following two have incompatible license with Debian rm -vfr $UP_BASE/3rdparty/Console/Getopt.php rm -vfr $UP_BASE/3rdparty/Crypt_Blowfish -# remove expermental app: external storage -rm -vfr $UP_BASE/apps/files_external -rm -vfr $UP_BASE/3rdparty/smb4php ## End mv "$UP_BASE" "$DIR/$REPACK_DIR" diff -Nur debian.orig//rules debian//rules --- debian.orig//rules 2012-10-11 14:17:07.000000000 +0200 +++ debian//rules 2012-10-24 17:02:32.000000000 +0200 @@ -15,12 +15,11 @@ rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt - rm debian/owncloud/usr/share/owncloud/3rdparty/when/MIT-LICENSE.txt rm debian/owncloud/usr/share/owncloud/apps/calendar/img/Icon\ License - rm debian/owncloud/usr/share/owncloud/apps/contacts/js/LICENSE.jquery.inview - rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/LICENSE rm debian/owncloud/usr/share/owncloud/apps/files_texteditor/js/aceeditor/LICENSE + rm debian/owncloud/usr/share/owncloud/core/js/LICENSE.jquery.inview rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License + rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/*-LICENSE.txt # Remove other stuff rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/README.md @@ -39,8 +38,7 @@ # Remove an unused scripts, source and minified JavaScript files. rm -r debian/owncloud/usr/share/owncloud/3rdparty/phpass/c rm debian/owncloud/usr/share/owncloud/3rdparty/phpass/test.php - rm debian/owncloud/usr/share/owncloud/apps/contacts/js/jquery.inview.txt - rm debian/owncloud/usr/share/owncloud/apps/files_pdfviewer/js/pdfjs/update.sh + rm debian/owncloud/usr/share/owncloud/core/js/jquery.inview.txt rm -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl rm debian/owncloud/usr/share/owncloud/l10n/init.sh @@ -64,6 +62,8 @@ rm debian/owncloud/usr/share/owncloud/apps/files_odfviewer/js/webodf-debug.js yui-compressor --type js debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js -o debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.min.js rm debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel.js + yui-compressor --type js debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js -o debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.min.js + rm debian/owncloud/usr/share/owncloud/3rdparty/miniColors/js/jquery.miniColors.js # Move the MDB2 Sqlite driver to owncloud-sqlite. mv debian/owncloud/usr/share/owncloud/lib/MDB2 debian/owncloud-sqlite/usr/share/php # php-mdb2-driver-sqlite (not yet)
signature.asc
Description: OpenPGP digital signature
