[Pkg-owncloud-commits] [SCM] owncloud.git branch, debian-wheezy, updated. debian/4.0.4debian-1-1-g3eb9fd3
Thomas Mueller
thomas.mueller at tmit.eu
Wed Sep 5 22:14:35 UTC 2012
The following commit has been merged in the debian-wheezy branch:
commit 3eb9fd3bfea5a9e03d792d681849db43ff31c977
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date: Thu Sep 6 00:14:31 2012 +0200
backport of fixes which have been applied to 4.0.5debian and 4.0.7debian
diff --git a/debian/changelog b/debian/changelog
index 1028475..68be7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+owncloud (4.0.4debian-2) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - Added fix_writing_to_shared_readonly.diff to fix WebDAV write access to
+ shared files (Closes: #684426)
+
+ * debian/rules:
+ - Remove experimental feature 'files_external'
+
+ * debian/repack.sh:
+ - Remove experimental feature 'files_external'
+ - Removed sourceless minified JavaScript files core/js/jquery-1.7.2.min.js
+ and core/js/jquery-ui-1.8.16.custom.min.js (closes: #683395)
+ - Removed 3rdparty/Console/Getopt.php and 3rdparty/Crypt_Blowfish
+ (closes: #683397)
+
+ * debian/copyright:
+ - Inserted full text of CC-BY-3.0 (closes: #683396)
+ - Removed PHP-3 license (closes: #683397)
+
+ -- Thomas Mueller <thomas.mueller at tmit.eu> Wed, 05 Sep 2012 23:36:08 +0200
+
owncloud (4.0.4debian-1) unstable; urgency=medium
* New upstream bugfix release; solve major issues with caching
diff --git a/debian/copyright b/debian/copyright
index f724873..f306c4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,14 +23,6 @@ Files: 3rdparty/Archive/Tar.php
Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
License: BSD-2-clause
-Files: 3rdparty/Console/Getopt.php
-Copyright: 1997-2003, The PHP Group
-License: PHP-3
-
-Files: 3rdparty/Crypt_Blowfish/*
-Copyright: 2005, Matthew Fonda <mfonda at php.net>
-License: PHP-3
-
Files: 3rdparty/MDB2/*
3rdparty/MDB2.php
Copyright: 1998-2008, Manuel Lemos
@@ -287,7 +279,7 @@ Comment: License referred to as GNU General Public License, but GPL
version 3 is linked.
Files: core/js/jquery-*.js
-Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
+Copyright: 2005-2011, John Resig, Brandon Aaron & Jörn Zaefferer
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
@@ -314,7 +306,7 @@ Copyright: 2011, Paul Bakaus (ui.jquery.com)
Aaron Eisenberger (aaronchi at gmail.com)
Ariel Flesler
Bohdan Ganicky
- Scott González
+ Scott González
Marc Grabanski (m at marcgrabanski.com)
Klaus Hartl (stilbuero.de)
Scott Jehl
@@ -327,7 +319,7 @@ Copyright: 2011, Paul Bakaus (ui.jquery.com)
Keith Wood (kbwood at virginbroadband.com.au)
Maggie Costello Wachs
Richard D. Worth (rdworth.org)
- Jörn Zaefferer (bassistance.de)
+ Jörn Zaefferer (bassistance.de)
License: Expat or GPL-2
Comment: Expat license referred to as MIT license.
@@ -1064,42 +1056,301 @@ License: BSD-3-clause-SabreDAV
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License: CC-BY-3
- You are free:
- .
- * to Share — to copy, distribute and transmit the work
- * to Remix — to adapt the work
- * to make commercial use of the work
- .
- Under the following conditions:
- .
- * Attribution — You must attribute the work in the manner specified by the
- author or licensor (but not in any way that suggests that they endorse
- you or your use of the work).
- .
- With the understanding that:
- .
- * Waiver — Any of the above conditions can be waived if you get permission
- from the copyright holder.
- .
- * Public Domain — Where the work or any of its elements is in the public
- domain under applicable law, that status is in no way affected by the
- license.
- .
- * Other Rights — In no way are any of the following rights affected by the
- license:
- .
- - Your fair dealing or fair use rights, or other applicable copyright
- exceptions and limitations;
- - The author's moral rights;
- - Rights other persons may have either in the work itself or in how the
- work is used, such as publicity or privacy rights.
- .
- Notice — For any reuse or distribution, you must make clear to others the
- license terms of this work. The best way to do this is with a link to
- this web page.
- .
- For the full legal code of the license see:
- http://creativecommons.org/licenses/by/3/legalcode
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
+ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
+ CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED
+ HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ .
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation, derivative
+ work, arrangement of music or other alterations of a literary or
+ artistic work, or phonogram or performance and includes cinematographic
+ adaptations or any other form in which the Work may be recast,
+ transformed, or adapted including in any form recognizably derived from
+ the original, except that a work that constitutes a Collection will not
+ be considered an Adaptation for the purpose of this License. For the
+ avoidance of doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with a
+ moving image ("synching") will be considered an Adaptation for the
+ purpose of this License.
+ .
+ b. "Collection" means a collection of literary or artistic works, such as
+ encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed in
+ Section 1(f) below, which, by reason of the selection and arrangement of
+ their contents, constitute intellectual creations, in which the Work is
+ included in its entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works in
+ themselves, which together are assembled into a collective whole. A work
+ that constitutes a Collection will not be considered an Adaptation (as
+ defined above) for the purposes of this License.
+ .
+ c. "Distribute" means to make available to the public the original and
+ copies of the Work or Adaptation, as appropriate, through sale or other
+ transfer of ownership.
+ .
+ d. "Licensor" means the individual, individuals, entity or entities that
+ offer(s) the Work under the terms of this License.
+ .
+ e. "Original Author" means, in the case of a literary or artistic work, the
+ individual, individuals, entity or entities who created the Work or if
+ no individual or entity can be identified, the publisher; and in
+ addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ .
+ f. "Work" means the literary and/or artistic work offered under the terms
+ of this License including without limitation any production in the
+ literary, scientific and artistic domain, whatever may be the mode or
+ form of its expression including digital form, such as a book, pamphlet
+ and other writing; a lecture, address, sermon or other work of the same
+ nature; a dramatic or dramatico-musical work; a choreographic work or
+ entertainment in dumb show; a musical composition with or without words;
+ a cinematographic work to which are assimilated works expressed by a
+ process analogous to cinematography; a work of drawing, painting,
+ architecture, sculpture, engraving or lithography; a photographic work
+ to which are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan, sketch
+ or three-dimensional work relative to geography, topography,
+ architecture or science; a performance; a broadcast; a phonogram; a
+ compilation of data to the extent it is protected as a copyrightable
+ work; or a work performed by a variety or circus performer to the extent
+ it is not otherwise considered a literary or artistic work.
+ .
+ g. "You" means an individual or entity exercising rights under this License
+ who has not previously violated the terms of this License with respect
+ to the Work, or who has received express permission from the Licensor to
+ exercise rights under this License despite a previous violation.
+ .
+ h. "Publicly Perform" means to perform public recitations of the Work and
+ to communicate to the public those public recitations, by any means or
+ process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a place
+ individually chosen by them; to perform the Work to the public by any
+ means or process and the communication to the public of the performances
+ of the Work, including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or images.
+ .
+ i. "Reproduce" means to make copies of the Work by any means including
+ without limitation by sound or visual recordings and the right of
+ fixation and reproducing fixations of the Work, including storage of a
+ protected performance or phonogram in digital form or other electronic
+ medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ .
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ .
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+ including any translation in any medium, takes reasonable steps to
+ clearly label, demarcate or otherwise identify that changes were made to
+ the original Work. For example, a translation could be marked "The
+ original work was translated from English to Spanish," or a modification
+ could indicate "The original work has been modified.";
+ .
+ c. to Distribute and Publicly Perform the Work including as incorporated in
+ Collections; and,
+ .
+ d. to Distribute and Publicly Perform Adaptations.
+ .
+ e. For the avoidance of doubt:
+ .
+ i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or
+ compulsory licensing scheme cannot be waived, the Licensor reserves
+ the exclusive right to collect such royalties for any exercise by You
+ of the rights granted under this License;
+ .
+ ii. Waivable Compulsory License Schemes. In those jurisdictions in which
+ the right to collect royalties through any statutory or compulsory
+ licensing scheme can be waived, the Licensor waives the exclusive
+ right to collect such royalties for any exercise by You of the rights
+ granted under this License; and,
+ .
+ iii. Voluntary License Schemes. The Licensor waives the right to collect
+ royalties, whether individually or, in the event that the Licensor is
+ a member of a collecting society that administers voluntary licensing
+ schemes, via that society, from any exercise by You of the rights
+ granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make such
+ modifications as are technically necessary to exercise the rights in other
+ media and formats. Subject to Section 8(f), all rights not expressly
+ granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made
+ subject to and limited by the following restrictions:
+ .
+ a. You may Distribute or Publicly Perform the Work only under the terms of
+ this License. You must include a copy of, or the Uniform Resource
+ Identifier (URI) for, this License with every copy of the Work You
+ Distribute or Publicly Perform. You may not offer or impose any terms on
+ the Work that restrict the terms of this License or the ability of the
+ recipient of the Work to exercise the rights granted to that recipient
+ under the terms of the License. You may not sublicense the Work. You
+ must keep intact all notices that refer to this License and to the
+ disclaimer of warranties with every copy of the Work You Distribute or
+ Publicly Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work that
+ restrict the ability of a recipient of the Work from You to exercise the
+ rights granted to that recipient under the terms of the License. This
+ Section 4(a) applies to the Work as incorporated in a Collection, but
+ this does not require the Collection apart from the Work itself to be
+ made subject to the terms of this License. If You create a Collection,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collection any credit as required by Section 4(b), as
+ requested. If You create an Adaptation, upon notice from any Licensor
+ You must, to the extent practicable, remove from the Adaptation any
+ credit as required by Section 4(b), as requested.
+ .
+ b. If You Distribute, or Publicly Perform the Work or any Adaptations or
+ Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party or
+ parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the extent
+ reasonably practicable, the URI, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and (iv) ,
+ consistent with Section 3(b), in the case of an Adaptation, a credit
+ identifying the use of the Work in the Adaptation (e.g., "French
+ translation of the Work by Original Author," or "Screenplay based on
+ original Work by Original Author"). The credit required by this Section
+ 4 (b) may be implemented in any reasonable manner; provided, however,
+ that in the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the Adaptation
+ or Collection appears, then as part of these credits and in a manner at
+ least as prominent as the credits for the other contributing authors.
+ For the avoidance of doubt, You may only use the credit required by this
+ Section for the purpose of attribution in the manner set out above and,
+ by exercising Your rights under this License, You may not implicitly or
+ explicitly assert or imply any connection with, sponsorship or
+ endorsement by the Original Author, Licensor and/or Attribution Parties,
+ as appropriate, of You or Your use of the Work, without the separate,
+ express prior written permission of the Original Author, Licensor and/or
+ Attribution Parties.
+ .
+ c. Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any Adaptations
+ or Collections, You must not distort, mutilate, modify or take other
+ derogatory action in relation to the Work which would be prejudicial to
+ the Original Author's honor or reputation. Licensor agrees that in those
+ jurisdictions (e.g. Japan), in which any exercise of the right granted
+ in Section 3(b) of this License (the right to make Adaptations) would be
+ deemed to be a distortion, mutilation, modification or other derogatory
+ action prejudicial to the Original Author's honor and reputation, the
+ Licensor will waive or not assert, as appropriate, this Section, to the
+ fullest extent permitted by the applicable national law, to enable You
+ to reasonably exercise Your right under Section 3(b) of this License
+ (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+ WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability.
+ .
+ EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL
+ LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF
+ THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections from
+ You under this License, however, will not have their licenses terminated
+ provided such individuals or entities remain in full compliance with
+ those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any
+ termination of this License.
+ .
+ b. Subject to the above terms and conditions, the license granted here is
+ perpetual (for the duration of the applicable copyright in the Work).
+ Notwithstanding the above, Licensor reserves the right to release the
+ Work under different license terms or to stop distributing the Work at
+ any time; provided, however that any such election will not serve to
+ withdraw this License (or any other license that has been, or is required
+ to be, granted under the terms of this License), and this License will
+ continue in full force and effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+ a. Each time You Distribute or Publicly Perform the Work or a Collection, the
+ Licensor offers to the recipient a license to the Work on the same terms
+ and conditions as the license granted to You under this License.
+ .
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+ offers to the recipient a license to the original Work on the same terms
+ and conditions as the license granted to You under this License.
+ .
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of the
+ remainder of the terms of this License, and without further action by the
+ parties to this agreement, such provision shall be reformed to the minimum
+ extent necessary to make such provision valid and enforceable.
+ .
+ d. No term or provision of this License shall be deemed waived and no breach
+ consented to unless such waiver or consent shall be in writing and signed
+ by the party to be charged with such waiver or consent.
+ .
+ e. This License constitutes the entire agreement between the parties with
+ respect to the Work licensed here. There are no understandings, agreements
+ or representations with respect to the Work not specified here. Licensor
+ shall not be bound by any additional provisions that may appear in any
+ communication from You. This License may not be modified without the
+ mutual written agreement of the Licensor and You.
+ .
+ f. The rights granted under, and the subject matter referenced, in this
+ License were drafted utilizing the terminology of the Berne Convention for
+ the Protection of Literary and Artistic Works (as amended on September 28,
+ 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the
+ WIPO Performances and Phonograms Treaty of 1996 and the Universal
+ Copyright Convention (as revised on July 24, 1971). These rights and
+ subject matter take effect in the relevant jurisdiction in which the
+ License terms are sought to be enforced according to the corresponding
+ provisions of the implementation of those treaty provisions in the
+ applicable national law. If the standard suite of rights granted under
+ applicable copyright law includes additional rights not granted under this
+ License, such additional rights are deemed to be included in the License;
+ this License is not intended to restrict the license of any rights under
+ applicable law.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1198,51 +1449,4 @@ License: MPL-1.1
for the specific language governing rights and limitations under the
License.
-License: PHP-3
- Redistribution and use in source and binary forms, with or without
- modification, is permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- 3. The name "PHP" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact group at php.net.
- .
- 4. Products derived from this software may not be called "PHP", nor
- may "PHP" appear in their name, without prior written permission from
- group at php.net. You may indicate that your software works in
- conjunction with PHP by saying "Foo for PHP" instead of calling it
- "PHP Foo" or "phpfoo"
- .
- 5. The PHP Group may publish revised and/or new versions of the
- license from time to time. Each version will be given a
- distinguishing version number. Once covered code has been published
- under a particular version of the license, you may always continue to
- use it under the terms of that version. You may also choose to use
- such covered code under the terms of any subsequent version of the
- license published by the PHP Group. No one other than the PHP Group
- has the right to modify the terms applicable to covered code created
- under this License.
- .
- 6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes PHP, freely available from
- <http://www.php.net/>".
- .
- THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
- ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
- DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/debian/patches/fix_writing_to_shared_readonly.diff b/debian/patches/fix_writing_to_shared_readonly.diff
new file mode 100644
index 0000000..4e42a9f
--- /dev/null
+++ b/debian/patches/fix_writing_to_shared_readonly.diff
@@ -0,0 +1,34 @@
+Origin: upstream, http://gitorious.org/owncloud/owncloud/commit/05648dac619942dfccc76180d30fcd79364355ec
+Author: Michael Gapczynski <mtgap at owncloud.com>
+Bug-Debian: http://bugs.debian.org/684426
+Last-Update: 2012-08-08
+
+--- owncloud-4.0.5debian2.orig/apps/files_sharing/sharedstorage.php
++++ owncloud-4.0.5debian2/apps/files_sharing/sharedstorage.php
+@@ -416,6 +416,25 @@ class OC_Filestorage_Shared extends OC_F
+ public function fopen($path, $mode) {
+ $source = $this->getSource($path);
+ if ($source) {
++ switch ($mode) {
++ case 'r+':
++ case 'rb+':
++ case 'w+':
++ case 'wb+':
++ case 'x+':
++ case 'xb+':
++ case 'a+':
++ case 'ab+':
++ case 'w':
++ case 'wb':
++ case 'x':
++ case 'xb':
++ case 'a':
++ case 'ab':
++ if (!$this->is_writable($path)) {
++ return false;
++ }
++ }
+ $storage = OC_Filesystem::getStorage($source);
+ return $storage->fopen($this->getInternalPath($source), $mode);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 11f55fe..f9e4be2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
fix_tar_require.diff
fix_sabre_requires.diff
fix_config.php_mode.diff
+fix_writing_to_shared_readonly.diff
diff --git a/debian/repack.sh b/debian/repack.sh
index 68157f8..f961182 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -29,6 +29,14 @@ fi
## Remove stuff
rm -vfr $UP_BASE/3rdparty/timepicker/css/include
+rm -vfr $UP_BASE/core/js/jquery-1.7.2.min.js
+rm -vfr $UP_BASE/core/js/jquery-ui-1.8.16.custom.min.js
+# 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 --git a/debian/rules b/debian/rules
index 30e5885..9222093 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/core/js/oc-vcategories.txt
rm -r debian/owncloud/usr/share/owncloud/apps/files_archive/tests
rm -r debian/owncloud/usr/share/owncloud/apps/files_encryption/tests
- rm -r debian/owncloud/usr/share/owncloud/apps/files_external/tests
rm -r debian/owncloud/usr/share/owncloud/apps/user_ldap/tests
rm -r debian/owncloud/usr/share/owncloud/l10n/templates # translation templates are not needed to run the app
@@ -43,8 +42,6 @@ override_dh_install:
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 -r debian/owncloud/usr/share/owncloud/apps/files_odfviewer/src
- rm debian/owncloud/usr/share/owncloud/core/js/jquery-1.7.2.min.js
- rm debian/owncloud/usr/share/owncloud/core/js/jquery-ui-1.8.16.custom.min.js
rm debian/owncloud/usr/share/owncloud/l10n/l10n.pl
rm debian/owncloud/usr/share/owncloud/l10n/init.sh
@@ -89,3 +86,4 @@ override_dh_fixperms:
chown www-data:www-data debian/owncloud/var/lib/owncloud/backup/
chmod 2770 debian/owncloud/var/lib/owncloud/backup/
chmod 0644 debian/owncloud/var/lib/owncloud/themes/README
+
--
owncloud.git
More information about the Pkg-owncloud-commits
mailing list