Hi Niels, Le 08/12/2014 16:46, Niels Thykier a écrit : > On 2014-12-07 20:11, David Prévot wrote:
>> Thanks, it has been ACCEPTed. The only change wrt the debdiff initially >> proposed is a new changlog entry, and a tiny fix in the previous one: > Thanks for the uploads. > > I will have a look at them as soon (within a few days). Thanks! (No hurry on my side.) FYI, upstream just officially released the 7.0.4 point released, and even if it doesn’t appear (yet) in their changelog, confirmed in the announcement it “contain[s] a lot of […] security fixes”. https://mailman.owncloud.org/pipermail/announcements/2014-December/000060.html I’ve uploaded it to experimental not to perturb the process of the current requests (I’ll follow up via another bug report once this RC version reaches testing if you still agree to consider it), but as a teaser, please find attached the minimal filtered debdiff against the RC2 version previously mentioned. 11 files changed, 49 insertions(+), 15 deletions(-) Regards David
diff --git a/apps/activity/l10n/fr.php b/apps/activity/l10n/fr.php
index f903760..efa6a26 100644
diff --git a/apps/bookmarks/l10n/fr.php b/apps/bookmarks/l10n/fr.php
index 05defe6..264780c 100644
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 709dbae..385e806 100644
diff --git a/apps/firstrunwizard/l10n/fr.php b/apps/firstrunwizard/l10n/fr.php
index 47bf351..13d2e64 100644
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 8a0191e..3ff1a99 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1084,12 +1084,18 @@ class Access extends LDAPUtility implements
user\IUserTools {
/**
* escapes (user provided) parts for LDAP filter
* @param string $input, the provided value
+ * @param bool $allowAsterisk wether in * at the beginning should be
preserved
* @return string the escaped string
*/
- public function escapeFilterPart($input) {
+ public function escapeFilterPart($input, $allowAsterisk = false) {
+ $asterisk = '';
+ if($allowAsterisk && strlen($input) > 0 && $input[0] === '*') {
+ $asterisk = '*';
+ $input = mb_substr($input, 1, null, 'UTF-8');
+ }
$search = array('*', '\\', '(', ')');
$replace = array('\\*', '\\\\', '\\(', '\\)');
- return str_replace($search, $replace, $input);
+ return $asterisk . str_replace($search, $replace, $input);
}
/**
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index b784662..8bd9dd9 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -93,7 +93,7 @@ class USER_LDAP extends BackendUtility implements
\OCP\UserInterface {
* Get a list of all users.
*/
public function getUsers($search = '', $limit = 10, $offset = 0) {
- $search = $this->access->escapeFilterPart($search);
+ $search = $this->access->escapeFilterPart($search, true);
$cachekey = 'getUsers-'.$search.'-'.$limit.'-'.$offset;
//check if users are cached, if so return
diff --git
a/core/doc/admin/_sources/configuration/config_sample_php_parameters.txt
b/core/doc/admin/_sources/configuration/config_sample_php_parameters.txt
index e207c98..e82e8ff 100644
diff --git a/core/doc/admin/_sources/configuration/database_configuration.txt
b/core/doc/admin/_sources/configuration/database_configuration.txt
index 184f20e..a164a2a 100644
diff --git a/core/doc/admin/configuration/antivirus_configuration.html
b/core/doc/admin/configuration/antivirus_configuration.html
index 4affabf..8164ee3 100644
diff --git a/core/doc/admin/configuration/automatic_configuration.html
b/core/doc/admin/configuration/automatic_configuration.html
index 2928151..ea48d24 100644
diff --git a/core/doc/admin/configuration/background_jobs_configuration.html
b/core/doc/admin/configuration/background_jobs_configuration.html
index 0dd75b3..ee36630 100644
diff --git a/core/doc/admin/configuration/big_file_upload_configuration.html
b/core/doc/admin/configuration/big_file_upload_configuration.html
index 6d6bd29..9aed652 100644
diff --git
a/core/doc/admin/configuration/collaborative_documents_configuration.html
b/core/doc/admin/configuration/collaborative_documents_configuration.html
index 95515c4..37e9f3b 100644
diff --git a/core/doc/admin/configuration/config_sample_php_parameters.html
b/core/doc/admin/configuration/config_sample_php_parameters.html
index 4a34d89..285d714 100644
diff --git a/core/doc/admin/configuration/custom_client_configuration.html
b/core/doc/admin/configuration/custom_client_configuration.html
index 70159c5..e938289 100644
diff --git a/core/doc/admin/configuration/database_configuration.html
b/core/doc/admin/configuration/database_configuration.html
index 5ed4367..742c73e 100644
diff --git a/core/doc/admin/configuration/email_configuration.html
b/core/doc/admin/configuration/email_configuration.html
index 9720c8b..3dd079d 100644
diff --git a/core/doc/admin/configuration/encryption_configuration.html
b/core/doc/admin/configuration/encryption_configuration.html
index b056b92..15eafa2 100644
diff --git a/core/doc/admin/configuration/external_storage_configuration.html
b/core/doc/admin/configuration/external_storage_configuration.html
index 3cc87d2..7063f92 100644
diff --git
a/core/doc/admin/configuration/external_storage_configuration_gui.html
b/core/doc/admin/configuration/external_storage_configuration_gui.html
index 53928a1..392e3a1 100644
diff --git a/core/doc/admin/configuration/file_sharing_configuration.html
b/core/doc/admin/configuration/file_sharing_configuration.html
index 25f045e..c0c4ca5 100644
diff --git a/core/doc/admin/configuration/files_locking_enabling.html
b/core/doc/admin/configuration/files_locking_enabling.html
index 91c6153..3198809 100644
diff --git a/core/doc/admin/configuration/index.html
b/core/doc/admin/configuration/index.html
index 9b5c26f..3070587 100644
diff --git
a/core/doc/admin/configuration/js_css_asset_management_configuration.html
b/core/doc/admin/configuration/js_css_asset_management_configuration.html
index 8e2c150..41e1ef4 100644
diff --git a/core/doc/admin/configuration/knowledgebase_configuration.html
b/core/doc/admin/configuration/knowledgebase_configuration.html
index f69af25..96ea6eb 100644
diff --git a/core/doc/admin/configuration/language_configuration.html
b/core/doc/admin/configuration/language_configuration.html
index 5caaa1f..49112d3 100644
diff --git a/core/doc/admin/configuration/logging_configuration.html
b/core/doc/admin/configuration/logging_configuration.html
index be1bdaa..00cb457 100644
diff --git a/core/doc/admin/configuration/previews_configuration.html
b/core/doc/admin/configuration/previews_configuration.html
index bcb1d64..f949919 100644
diff --git a/core/doc/admin/configuration/reverse_proxy_configuration.html
b/core/doc/admin/configuration/reverse_proxy_configuration.html
index 12e21a9..ffa1790 100644
diff --git a/core/doc/admin/configuration/search_configuration.html
b/core/doc/admin/configuration/search_configuration.html
index 0c43bae..15947bb 100644
diff --git a/core/doc/admin/configuration/server_to_server_configuration.html
b/core/doc/admin/configuration/server_to_server_configuration.html
index 4b16f1c..59238a3 100644
diff --git
a/core/doc/admin/configuration/serving_static_files_configuration.html
b/core/doc/admin/configuration/serving_static_files_configuration.html
index ab589f4..d6fd1fa 100644
diff --git a/core/doc/admin/configuration/thirdparty_php_configuration.html
b/core/doc/admin/configuration/thirdparty_php_configuration.html
index f60ac76..67d36fc 100644
diff --git a/core/doc/admin/configuration/user_auth_ftp_smb_imap.html
b/core/doc/admin/configuration/user_auth_ftp_smb_imap.html
index aabeaf0..73472dc 100644
diff --git a/core/doc/admin/configuration/user_auth_ldap.html
b/core/doc/admin/configuration/user_auth_ldap.html
index 3a1e86f..d54ea64 100644
diff --git a/core/doc/admin/configuration/user_configuration.html
b/core/doc/admin/configuration/user_configuration.html
index 02adfba..09ee275 100644
diff --git a/core/doc/admin/contents.html b/core/doc/admin/contents.html
index 8b2cf2c..e0ed903 100644
diff --git a/core/doc/admin/genindex.html b/core/doc/admin/genindex.html
index 07e594f..c93840b 100644
diff --git a/core/doc/admin/index.html b/core/doc/admin/index.html
index e9432a8..5bfa575 100644
diff --git a/core/doc/admin/installation/appliance_installation.html
b/core/doc/admin/installation/appliance_installation.html
index fd2be9a..ea08323 100644
diff --git a/core/doc/admin/installation/apps_management_installation.html
b/core/doc/admin/installation/apps_management_installation.html
index 6c72ef6..265e0f1 100644
diff --git a/core/doc/admin/installation/hiawatha_configuration.html
b/core/doc/admin/installation/hiawatha_configuration.html
index 87c73c1..40c51b3 100644
diff --git a/core/doc/admin/installation/index.html
b/core/doc/admin/installation/index.html
index e45d839..811eb2a 100644
diff --git a/core/doc/admin/installation/installation_wizard.html
b/core/doc/admin/installation/installation_wizard.html
index 2a2979a..1cbc203 100644
diff --git a/core/doc/admin/installation/lighttpd_configuration.html
b/core/doc/admin/installation/lighttpd_configuration.html
index 93595cb..44c25bf 100644
diff --git a/core/doc/admin/installation/linux_installation.html
b/core/doc/admin/installation/linux_installation.html
index 5f1f0ea..7767e39 100644
diff --git a/core/doc/admin/installation/macos_installation.html
b/core/doc/admin/installation/macos_installation.html
index 3cab272..63f0806 100644
diff --git a/core/doc/admin/installation/nginx_configuration.html
b/core/doc/admin/installation/nginx_configuration.html
index 2ca7bf3..3096cd7 100644
diff --git a/core/doc/admin/installation/others_installation.html
b/core/doc/admin/installation/others_installation.html
index 9400435..44f9662 100644
diff --git a/core/doc/admin/installation/selinux_configuration.html
b/core/doc/admin/installation/selinux_configuration.html
index 4b79257..2bbb074 100644
diff --git a/core/doc/admin/installation/source_installation.html
b/core/doc/admin/installation/source_installation.html
index b6581b0..d9b8b4e 100644
diff --git a/core/doc/admin/installation/ucs_installation.html
b/core/doc/admin/installation/ucs_installation.html
index 69fed4e..d3f813a 100644
diff --git a/core/doc/admin/installation/windows_installation.html
b/core/doc/admin/installation/windows_installation.html
index 1f174d8..2c51915 100644
diff --git a/core/doc/admin/installation/yaws_configuration.html
b/core/doc/admin/installation/yaws_configuration.html
index cccdf9a..c41514c 100644
diff --git a/core/doc/admin/issues/index.html b/core/doc/admin/issues/index.html
index 9598696..562b982 100644
diff --git a/core/doc/admin/maintenance/backup.html
b/core/doc/admin/maintenance/backup.html
index b679365..376f2a8 100644
diff --git a/core/doc/admin/maintenance/convert_db.html
b/core/doc/admin/maintenance/convert_db.html
index 8d666c0..3bc710e 100644
diff --git a/core/doc/admin/maintenance/enable_maintenance.html
b/core/doc/admin/maintenance/enable_maintenance.html
index c403a3e..bb234a4 100644
diff --git a/core/doc/admin/maintenance/index.html
b/core/doc/admin/maintenance/index.html
index df07eab..e768619 100644
diff --git a/core/doc/admin/maintenance/migrating.html
b/core/doc/admin/maintenance/migrating.html
index c86c59d..babc504 100644
diff --git a/core/doc/admin/maintenance/restore.html
b/core/doc/admin/maintenance/restore.html
index e8e495a..ad3df1b 100644
diff --git a/core/doc/admin/maintenance/update.html
b/core/doc/admin/maintenance/update.html
index 5553309..2bcbf09 100644
diff --git a/core/doc/admin/maintenance/upgrade.html
b/core/doc/admin/maintenance/upgrade.html
index b8598b4..eced222 100644
diff --git a/core/doc/admin/objects.inv b/core/doc/admin/objects.inv
index 5ee54a8..1a194f5 100644
Binary files a/core/doc/admin/objects.inv and b/core/doc/admin/objects.inv
differ
diff --git a/core/doc/admin/search.html b/core/doc/admin/search.html
index ac52f0f..69c60ca 100644
diff --git a/core/doc/admin/whats_new_admin.html
b/core/doc/admin/whats_new_admin.html
index eb459ef..9250cb7 100644
diff --git a/core/doc/user/_sources/documents.txt
b/core/doc/user/_sources/documents.txt
index d5dc8bb..70ae54f 100644
diff --git a/core/doc/user/bookmarks.html b/core/doc/user/bookmarks.html
index 17a3e3b..a3113e0 100644
diff --git a/core/doc/user/contents.html b/core/doc/user/contents.html
index 4e008a4..cc9e728 100644
diff --git a/core/doc/user/documents.html b/core/doc/user/documents.html
index 1b3df80..89f8843 100644
diff --git a/core/doc/user/external_storage/google_drive.html
b/core/doc/user/external_storage/google_drive.html
index 6d769cb..2660f40 100644
diff --git a/core/doc/user/files/configuring_big_file_upload.html
b/core/doc/user/files/configuring_big_file_upload.html
index 4fb733e..5e2ab57 100644
diff --git a/core/doc/user/files/deletedfiles.html
b/core/doc/user/files/deletedfiles.html
index 0bce721..8c60f63 100644
diff --git a/core/doc/user/files/encryption.html
b/core/doc/user/files/encryption.html
index 9fc9d97..d5586dd 100644
diff --git a/core/doc/user/files/files.html b/core/doc/user/files/files.html
index 0e7c4cd..7bea848 100644
diff --git a/core/doc/user/files/filesweb.html
b/core/doc/user/files/filesweb.html
index 1946f25..9395160 100644
diff --git a/core/doc/user/files/index.html b/core/doc/user/files/index.html
index b18a4a6..7cb59a1 100644
diff --git a/core/doc/user/files/quota.html b/core/doc/user/files/quota.html
index e3470a2..8a67a72 100644
diff --git a/core/doc/user/files/server_to_server_using.html
b/core/doc/user/files/server_to_server_using.html
index 895b2fa..3a39e17 100644
diff --git a/core/doc/user/files/sync.html b/core/doc/user/files/sync.html
index add8098..0b09234 100644
diff --git a/core/doc/user/files/versioncontrol.html
b/core/doc/user/files/versioncontrol.html
index faefb44..1b0816c 100644
diff --git a/core/doc/user/genindex.html b/core/doc/user/genindex.html
index 2e87601..fabdfb3 100644
diff --git a/core/doc/user/index.html b/core/doc/user/index.html
index a39221e..c4786f4 100644
diff --git a/core/doc/user/installing_apps.html
b/core/doc/user/installing_apps.html
index 55a120f..3d9a4c3 100644
diff --git a/core/doc/user/objects.inv b/core/doc/user/objects.inv
index 6b3dc21..ab59816 100644
Binary files a/core/doc/user/objects.inv and b/core/doc/user/objects.inv differ
diff --git a/core/doc/user/pim/calendar.html b/core/doc/user/pim/calendar.html
index da9610d..e149935 100644
diff --git a/core/doc/user/pim/contacts.html b/core/doc/user/pim/contacts.html
index 3299cea..0b18440 100644
diff --git a/core/doc/user/pim/index.html b/core/doc/user/pim/index.html
index 9913e55..c5c4526 100644
diff --git a/core/doc/user/pim/sync_ios.html b/core/doc/user/pim/sync_ios.html
index 4906dfd..30e4f2f 100644
diff --git a/core/doc/user/pim/sync_kde.html b/core/doc/user/pim/sync_kde.html
index e69d925..8e5a811 100644
diff --git a/core/doc/user/pim/sync_osx.html b/core/doc/user/pim/sync_osx.html
index 7221d81..ec13281 100644
diff --git a/core/doc/user/pim/sync_thunderbird.html
b/core/doc/user/pim/sync_thunderbird.html
index c3e9514b..afc37bd 100644
diff --git a/core/doc/user/pim/troubleshooting.html
b/core/doc/user/pim/troubleshooting.html
index b26c32c..83bd1c6 100644
diff --git a/core/doc/user/search.html b/core/doc/user/search.html
index f0dd4e3..6063b82 100644
diff --git a/core/doc/user/userpreferences.html
b/core/doc/user/userpreferences.html
index bc720a3..2c5596c 100644
diff --git a/core/doc/user/webinterface.html b/core/doc/user/webinterface.html
index c18068d..65641c7 100644
diff --git a/core/doc/user/whats_new.html b/core/doc/user/whats_new.html
index bd600e1..6bbde13 100644
diff --git a/debian/changelog b/debian/changelog
index d8b105c..9e835fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+owncloud (7.0.4+dfsg-1) experimental; urgency=medium
+
+ [ Lukas Reschke ]
+ * Trim port from domain
+ * Create config if it does not exists
+
+ [ Arthur Schiwon ]
+ * preserve an asterisk at the start when escaping a search term
+
+ [ Frank Karlitschek ]
+ * 7.0.4
+
+ [ David Prévot ]
+ * Refresh patches
+ * Update upstream changelog
+
+ -- David Prévot <taf...@debian.org> Tue, 09 Dec 2014 18:32:21 -0400
+
owncloud (7.0.4~rc2+dfsg-1) experimental; urgency=medium
* Upload RC to experimental
diff --git a/debian/patches/0001-Disable-the-appstore.patch
b/debian/patches/0001-Disable-the-appstore.patch
index 3c161ae..12ef5fc 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -54,7 +54,7 @@ index 6da3a68..fa627c5 100644
),
diff --git a/lib/base.php b/lib/base.php
-index e99159d..2c20932 100644
+index d653e06..f6684e0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -157,7 +157,7 @@ class OC {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch
b/debian/patches/0003-Improve-logfile-handling.patch
index 4751c96..02984b7 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -29,10 +29,10 @@ index 7e91a2e..2508e2e 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 2c20932..a8060f2 100644
+index f6684e0..d7a9b0e 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -609,7 +609,7 @@ class OC {
+@@ -617,7 +617,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
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 41027bf..1229946 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
@@ -14,10 +14,10 @@ Gbp: Topic path
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/base.php b/lib/base.php
-index a8060f2..4367ea2 100644
+index d7a9b0e..1f82058 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -431,12 +431,12 @@ class OC {
+@@ -439,12 +439,12 @@ class OC {
// register autoloader
require_once __DIR__ . '/autoloader.php';
self::$loader = new \OC\Autoloader();
diff --git a/debian/upstream/changelog b/debian/upstream/changelog
index bc0cda3..11d6131 100644
--- a/debian/upstream/changelog
+++ b/debian/upstream/changelog
@@ -1,4 +1,4 @@
-Version 7.0.4 December 8th 2014
+Version 7.0.4 December 9th 2014
Added XMLWriter check
Better deleted outdated previews
@@ -9,7 +9,9 @@ Version 7.0.4 December 8th 2014
fixing port configuration in trusted domains
LDAP fixes
Make group search case sensitive
- Allow admin to change users display name
+ Allow admin to change users display name
+ ldap performance improvements
+ config.php can now be read only
Several smaller fixes
Version 7.0.3 November 13th 2014
diff --git a/lib/base.php b/lib/base.php
index e99159d..d653e06 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -188,7 +188,15 @@ class OC {
public static function checkConfig() {
$l = OC_L10N::get('lib');
- $configFileWritable = file_exists(self::$configDir .
"/config.php") && is_writable(self::$configDir . "/config.php");
+
+ // Create config in case it does not already exists
+ $configFilePath = self::$configDir .'/config.php';
+ if(!file_exists($configFilePath)) {
+ @touch($configFilePath);
+ }
+
+ // Check if config is writable
+ $configFileWritable = is_writable($configFilePath);
if (!$configFileWritable &&
!OC_Helper::isReadOnlyConfigEnabled()
|| !$configFileWritable && \OCP\Util::needUpgrade()) {
if (self::$CLI) {
diff --git a/version.php b/version.php
index bf92a18..4f1fdb6 100644
--- a/version.php
+++ b/version.php
@@ -1,6 +1,6 @@
<?php
-$OC_Version = array(7,0,4,1);
-$OC_VersionString = '7.0.4 RC2';
+$OC_Version = array(7,0,4,2);
+$OC_VersionString = '7.0.4';
$OC_Edition = '';
-$OC_Channel = 'testing';
-$OC_Build = '2014-12-05T14:47:39+00:00';
+$OC_Channel = 'stable';
+$OC_Build = '2014-12-08T18:35:45+00:00';
signature.asc
Description: OpenPGP digital signature
