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

[David Prévot]

The following commit has been merged in the master branch:
commit e40196f7328905c062dd1fc0e3be828dfa2eccaa
Merge: 8205bdd303d2e4b895ce34eae7d3d7f2bd35cb29 4338654a015c1690cb82dc1e5cb780fd436246a0
Author: David Prévot <taffit at debian.org>
Date:   Fri Mar 22 19:34:47 2013 -0400

    Merge tag 'debian/4.0.8debian-1.6'
    
    Debian release 4.0.8debian-1.6
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index e9ac684,0eff11c..9b8722b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,18 +1,42 @@@
 +owncloud (5.0.0+debian-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +
 +  [ David Prévot ]
 +  * debian/watch: Update to current upstream URL and Debian version
 +  * debian/control:
 +    - Add php-services-json and liboauth-php to Recommends for Dropbox-php
 +    - Add clamav or clamav-daemon to Recommends for Owncloud Antivirus App
 +    - Add zendframework to Recommends for Full Text Search
 +  * debian/copyright: Document the new and updated licenses
 +  * debian/rules:
 +    - Trim duplicated and useless files from the package
 +    - Minify JavaScript
 +  * 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/owncloud.links: Link to Zend Framework instead of embedding a
 +    partial copy
 +
 + -- Paul van Tilburg <paulvt at debian.org>  Fri, 02 Nov 2012 22:20:35 +0100
 +
+ owncloud (4.0.8debian-1.6) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Fix "multiple vulnerabilities (oC-SA-2013-009, oC-SA-2013-010)":
+     add patches taken from upstream git:
+     + debian/patches/16_oc-sa-2013-010.patch
+       CVE-2013-1851: user_migrate: Local file disclosure
+       oC-SA-2013-010, commit edf7162 in stable4 branch
+     + debian/patches/17_oc-sa-2013-009.patch
+       CVE-2013-1850: Contacts: Bypass of file blacklist
+       oC-SA-2013-009, commit fae5bd3 in stable4 branch
+     (Closes: #703094)
+ 
+  -- gregor herrmann <gregoa at debian.org>  Tue, 19 Mar 2013 17:05:08 +0100
+ 
  owncloud (4.0.8debian-1.5) unstable; urgency=low
  
    * Non-maintainer upload.
diff --combined debian/patches/series
index 520cb96,703aa9c..0ad6366
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,6 +1,7 @@@
  01_fix_data_path.diff
  02_fix_crypt.diff
  03_fix_phpmailer.diff
 +04_add_onfontresize.diff
  05_no_app_store.diff
  fix_tar_require.diff
  fix_sabre_requires.diff
@@@ -16,3 -15,5 +16,5 @@@ fix_config.php_mode.dif
  13_oc-sa-2013-003.patch
  14_oc-sa-2013-004.patch
  15_oc-sa-2013-006.patch
+ 16_oc-sa-2013-010.patch
+ 17_oc-sa-2013-009.patch

-- 
owncloud.git