gentoo resync : 16.09.2021

4 files changed, 2 insertions, 132 deletions

diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index d7d5a41327f8..c68ace6fc4a6 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,6 +1,3 @@
-AUX owncloud-10.7.0-share_data_exposure.patch 3470 BLAKE2B 3a908d1909c776f2c8ccee17fda16fb91e199468b48b5359bd9ebf0bbb0f087d834cbddb54aba5b60af71afa01f1984ce580bb5b91aeeb0156a71f93ef65643b SHA512 2dfe05754cd6ea97a3bd014e7769d4106b90d6740e975778cd291bd7f74aa64c27d4b913847addec0c184e477bbdef07a09a59160dfc8c413e8af1229147e682
-DIST owncloud-10.7.0.tar.bz2 24129028 BLAKE2B 47ce3584f8123cc0a315c7d88847df5844c951e354fcecd7a876ca01f0fa24823a86bdd950dd885f3bbb46f60d8a39271e31d43ac6dac8f3df506d6cdc531231 SHA512 ebb636b8ffd06d4ceb1dd0d50c15ab393b8c7bf2f0e23c61ba957add6ac4d4ba4cdefb9cda2c703f337c82a295e2c40a467a602227728e9506f9a150c9f2fd3c
 DIST owncloud-10.8.0.tar.bz2 24917781 BLAKE2B 909a8b51034fe07f83adcb3aff9c8eab790da40b115ecc715c4307ecb0364d5f65d75178d76ff27969b28a46f9585915412db235120dbb8600809057eea3c7f1 SHA512 47a23e5c2946e5d4c1d8c8e6d1b754e2a2bce436af532dbc7aa36c8031185fcc28b500fefa064e5290f2af68cbea823fa893acdb90307c9eddf53e126d282c96
-EBUILD owncloud-10.7.0-r1.ebuild 1313 BLAKE2B 22352820fd58e425b94d4d3e71b770d33ae46e304c65d3b07a108e3ef51a5deb53a04fc441d5c7725920090486b1a359d0c3fb962102c40cb80dc347d2f3e6f4 SHA512 240820e4a192c685e873313fc1b28a3e2b4af2f0777d37ca5d13b6f2d06d2ac4bdbb06f5c10a85adb13a0e7c3ab7a180c58ae5dad477359f07e6a18fe85dcfd0
 EBUILD owncloud-10.8.0.ebuild 1255 BLAKE2B f55f9ff5dd004fd7408fb490cbc723bae315c55a68e72db1b4a458cdbe48c6e2e322fcc29d9b916679dd1be3097d9c8d6ac76fb266ca8eff446cc5d04a8c11c3 SHA512 c151fd9fbc8bfc7f7ab94729d8f11af150d1da1ed0e78943bd2f81206fbb7b8e913ceec63881655008cab4c69c86852ad1c850580df4dc678f389885e4e1f9e9
-MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
+MISC metadata.xml 363 BLAKE2B f3e41cd23ac1e4e6d8cddfc0291f626fe7e28379dc886a9bf9ea9ae9bfd94b646ecd6dcc7af9d808bd579f69728279bad991bd940777ab2cae199b805729daad SHA512 0e0200aa0ae268650f684d22f40701d3259cbdcca639042edd9fd875bfc218b217310238f5b9b97658917023bdf1fa5ed7aab82f068b4a03752b718138ff79ed
diff --git a/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch b/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch
deleted file mode 100644
index bab6ffed11ed..000000000000
--- a/www-apps/owncloud/files/owncloud-10.7.0-share_data_exposure.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b552f84eedb5d2a113028d7859e82352699fb427 Mon Sep 17 00:00:00 2001
-From: JanAckermann <jackermann@owncloud.com>
-Date: Tue, 4 May 2021 11:51:29 +0200
-Subject: [PATCH 1/3] Throw generic exception to overcome, senstitive exception
- data exposure
-
----
- .../lib/Controllers/ShareController.php       | 26 ++++++++++++-------
- 1 file changed, 16 insertions(+), 10 deletions(-)
-
-diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php
-index da9832e105b..02bd3553067 100644
---- a/apps/files_sharing/lib/Controllers/ShareController.php
-+++ b/apps/files_sharing/lib/Controllers/ShareController.php
-@@ -400,6 +400,7 @@ public function showShare($token, $path = '') {
- 	 * @param string $path
- 	 * @param string $downloadStartSecret
- 	 * @return NotFoundResponse|RedirectResponse|void
-+	 * @throws \Exception
- 	 */
- 	public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
- 		\OC_User::setIncognitoMode(true);
-@@ -530,16 +531,21 @@ public function downloadShare($token, $files = null, $path = '', $downloadStartS
- 		}
- 
- 		// download selected files
--		if ($files !== null && $files !== '') {
--			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
--			// after dispatching the request which results in a "Cannot modify header information" notice.
--			OC_Files::get($originalSharePath, $files_list, $server_params);
--			exit();
--		} else {
--			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
--			// after dispatching the request which results in a "Cannot modify header information" notice.
--			OC_Files::get(\dirname($originalSharePath), \basename($originalSharePath), $server_params);
--			exit();
-+
-+		try {
-+			if ($files !== null && $files !== '') {
-+				// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-+				// after dispatching the request which results in a "Cannot modify header information" notice.
-+				OC_Files::get($originalSharePath, $files_list, $server_params);
-+				exit();
-+			} else {
-+				// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-+				// after dispatching the request which results in a "Cannot modify header information" notice.
-+				OC_Files::get(\dirname($originalSharePath), \basename($originalSharePath), $server_params);
-+				exit();
-+			}
-+		} catch (\Exception $e) {
-+			throw new \Exception();
- 		}
- 	}
- }
-
-From a94f67a4857447e36e205043c55f29737a0bc57d Mon Sep 17 00:00:00 2001
-From: JanAckermann <jackermann@owncloud.com>
-Date: Tue, 4 May 2021 12:01:17 +0200
-Subject: [PATCH 2/3] enhanche if statement
-
----
- lib/private/Files/Storage/Local.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
-index d5ae0e3794b..d499079da98 100644
---- a/lib/private/Files/Storage/Local.php
-+++ b/lib/private/Files/Storage/Local.php
-@@ -384,7 +384,7 @@ public function getSourcePath($path) {
- 		}
- 		$pathToResolve = $fullPath;
- 		$realPath = \realpath($pathToResolve);
--		while ($realPath === false) { // for non existing files check the parent directory
-+		while (!\is_string($realPath)) { // for non existing files check the parent directory
- 			$pathToResolve = \dirname($pathToResolve);
- 			$realPath = \realpath($pathToResolve);
- 		}
-
diff --git a/www-apps/owncloud/metadata.xml b/www-apps/owncloud/metadata.xml
index 6608c097e970..1323b7cc207f 100644
--- a/www-apps/owncloud/metadata.xml
+++ b/www-apps/owncloud/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>voyageur@gentoo.org</email>
diff --git a/www-apps/owncloud/owncloud-10.7.0-r1.ebuild b/www-apps/owncloud/owncloud-10.7.0-r1.ebuild
deleted file mode 100644
index f379b0cf2d4d..000000000000
--- a/www-apps/owncloud/owncloud-10.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Web-based storage application where all your data is under your own control"
-HOMEPAGE="https://owncloud.org"
-SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+curl mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
-	virtual/httpd-php"
-
-PATCHES=( "${FILESDIR}"/${P}-share_data_exposure.patch )
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "Additional applications (calendar, ...) are no longer provided by default."
-	elog "You can install them after login via the applications management page"
-	elog "(check the recommended tab). No application data is lost."
-	webapp_pkg_postinst
-}