gentoo resync : 08.01.2021

13 files changed, 157 insertions, 205 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index b9158ffef605..c65b15651a8d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index c0fb27014c24..afe184010221 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,9 +1,4 @@
-AUX postinstall-en.txt 272 BLAKE2B 2042cf6fbf8d98ef144d19002c3498e4e5f6238b8d135066920ee999facf14a65ba3ed1269228dedbd7f17932a894c399379c19fcf2fccf648d7a7f30b0ffb49 SHA512 4f902e053ac38e313698269decfabe750ca41e255076972eb439f7c753dba50f09879e54df09768daf643da13c81a7bcd1f9bee834da9d29e91a5be88b38c740
 AUX postinstall-v0.7-en.txt 465 BLAKE2B adefd05b835bd3e27cc12137da53837dabd23790afe95fcc3e55e2dc1825342e96e2709c8d268fd0ec465b72faae7b5bd0fade0cb30fd0df2d8196bd49ae1e1b SHA512 8e532a5b229181cf32cc4a254688cc564a4a2dc80db64545fba0e093fa227a186a544b4dfc79c798e7d1021c1e01b7fb5f663f5b981082a32f6e6a0f98211df2
-DIST baikal-0.6.1.zip 3437686 BLAKE2B f28d3a63166a73571116759df3662c2b19c2eeeebcd7070574dfc3ee8cb046f2d94fdbc4701669291c1bb2cb2b9b92665726127c852c5457cd285f6ffbcc9b00 SHA512 d88ed9fbe1f934d52fd798165675b90972c47c9e138de61e17a14777590ebad5006c1a414a4e0119eb8fa718e01f2aadb6e1d180e23a51fb33e1b5a3539c9e38
-DIST baikal-0.7.1.zip 3596673 BLAKE2B ab32dd922a4af0f3858db89c6349f258429d744341a2a362e8d42980e6fb6f5a5892cf4b47b4bd5d0427a7ecd599705a42d3c11a391c110f2757f6b78cee35b5 SHA512 4a04624ba3158d89d01536e01238b4ea36a40df0c95e93fa676f3e8ebe65eeaa99b241ef346fd4fc71a2f44fab9b6f2ed2bca8c69c780725e424602f4d7d6f54
 DIST baikal-0.7.2.zip 3602276 BLAKE2B 160c1b45944c897e368450da935850749e4dc5c6fdb9607dc6da926a0a05d63b4921193a31fbd64be0c9ddad336ac49f5fc49c23fca5bbb251adca8793265ba9 SHA512 df1fd10c5fb63e6aa89ae4b733eacf102b11f6322c3fa6007d0308574395389c0c6bfd62b7a0d358c54baaa96a5ccdb40bd509258a59e417617bea8d0b3d42a3
-EBUILD baikal-0.6.1.ebuild 1449 BLAKE2B 21193bf53e21c7979ca0577b9dab5a7baaa1341e627d8a90eef80a0b9f325440ec91f7ef120d7758fcaa410b36ed01746aaeaa801c2e4219bfd8d2cf2b4ba20c SHA512 46f04d5c04793cb6b1db1688296644f5c6865f9f8049ce435103e946c4cce95cd4ef3a53d00a5e01d770bb95e32040c30b6964b29fd628cb7d049c1c0969fcf6
-EBUILD baikal-0.7.1.ebuild 1495 BLAKE2B eeed4fd23336d07ebb31e28a81bb408a40775e3bac1fcce7d173f9890ffe0c540d851811166b2bb3760621dcbe140ec3e328dc8fd8170aed97aa83eeb1f69d70 SHA512 873c0ea18387a0eb39dc9ca5348d404fa351d4a6b9dbc7a40fd0dd17877835fc51803d08f5f9f4d1419035edaf009711c88a7ced4647e6c3402cfe7bb20dc5d2
-EBUILD baikal-0.7.2.ebuild 1495 BLAKE2B 38079a7e73a0f87aa3539a7e40ea44b47818d8c6f550f63174d2bd893406f4da53027c2cc84c97f74e91cbc0ac0299d04e753e40250d22896f741c8876e73487 SHA512 ad2a6467f4217ccbebbf8cb4fca3c8d657900ef90cc6d18233856251b2bb5cb66804d353ba028002cf1546123dadd7ffba867fb232bd3677288e6016d2fffd3a
+EBUILD baikal-0.7.2.ebuild 1611 BLAKE2B e16c29f176061b80ef1fc1860678e2c61e5be960c3a12f45feaf0d15a07fe35c58354435d5ff357743baa40e819d66ef776e3cc546574ac07a0268b703adad1a SHA512 37f44fc2e1f437c16271e6f4e60ed457515dc49bce7dd29c891198c7fabadf75e6cd7d9865f5801ab3b56758f141b7a72758a5b072ab7c855ff3cd9b145b93bb
 MISC metadata.xml 325 BLAKE2B 92c24f0b14c94c6666fe915eda815354af8f73d3f829ff414afcd4ff49b775191ee79ec9000718a795799060ccca8f10acf5ca27d861943ee5ac5c5a34d69ce0 SHA512 2b6f9ba13bbc4821f79703ba0fe5829b4ec30817b9571c05698d65cadbd52444bd3dcff42f0807f4fcdfc9269db6edb858bb0301a50546b0741929030bc196c9
diff --git a/www-apps/baikal/baikal-0.6.1.ebuild b/www-apps/baikal/baikal-0.6.1.ebuild
deleted file mode 100644
index ba407dd2359c..000000000000
--- a/www-apps/baikal/baikal-0.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/"
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc *.md
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor
-
-	einfo "Setting up container for configuration"
-	insinto /etc/${PN}
-
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
-	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym . "${MY_HTDOCSDIR}"/html
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	webapp_src_install
-
-	if has_version www-servers/apache ; then
-		fowners -R apache:apache /etc/${PN}
-	elif has_version www-servers/nginx ; then
-		fowners -R nginx:nginx /etc/${PN}
-	else
-		einfo "/etc/${PN} must be owned by the webserver user for baikal"
-	fi
-}
diff --git a/www-apps/baikal/baikal-0.7.1.ebuild b/www-apps/baikal/baikal-0.7.1.ebuild
deleted file mode 100644
index 450d04422760..000000000000
--- a/www-apps/baikal/baikal-0.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/"
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
-	mysql? ( virtual/mysql )
-	sqlite? ( dev-db/sqlite )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc *.md
-
-	einfo "Installing web files"
-	insinto "${MY_HTDOCSDIR}"
-	doins -r html/* html/.htaccess Core vendor
-
-	einfo "Setting up container for configuration"
-	dodir /etc/${PN}
-
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
-	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
-	dosym . "${MY_HTDOCSDIR}"/html
-
-	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
-	webapp_src_install
-
-	if has_version www-servers/apache ; then
-		fowners -R apache:apache /etc/${PN}
-	elif has_version www-servers/nginx ; then
-		fowners -R nginx:nginx /etc/${PN}
-	else
-		einfo "/etc/${PN} must be owned by the webserver user for baikal"
-	fi
-}
diff --git a/www-apps/baikal/baikal-0.7.2.ebuild b/www-apps/baikal/baikal-0.7.2.ebuild
index 39d0aca079d3..373282d259b3 100644
--- a/www-apps/baikal/baikal-0.7.2.ebuild
+++ b/www-apps/baikal/baikal-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -34,15 +34,19 @@ src_install() {
 	einfo "Setting up container for configuration"
 	dodir /etc/${PN}
 
-	einfo "Fixing symlinks"
-	local link target
-	find "${D}${MY_HTDOCSDIR}" -type l | while read link ; do
-		target=$(readlink "${link}")
-		target=${target/..\/Core/Core}
-		rm "${link}" && ln -s "${target}" "${link}"
+	# setup config in /etc
+	# we are not allowed to use straight-forward absolute symlink :(
+	local root path htdocsdir=${MY_HTDOCSDIR%/}
+	while [[ -n ${htdocsdir} ]] ; do
+		root+="../"
+		htdocsdir=${htdocsdir%/*}
+		# trim duplicate slashes
+		while [[ ${htdocsdir} == */ ]] ; do
+			htdocsdir=${htdocsdir%/}
+		done
 	done
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/Specific
-	dosym /etc/${PN} "${MY_HTDOCSDIR}"/config
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific
+	dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config
 	dosym . "${MY_HTDOCSDIR}"/html
 
 	webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
diff --git a/www-apps/baikal/files/postinstall-en.txt b/www-apps/baikal/files/postinstall-en.txt
deleted file mode 100644
index e6a11275dc85..000000000000
--- a/www-apps/baikal/files/postinstall-en.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-In order to setup baikal:
-- create /etc/${PN}/ENABLE_INSTALL owner apache:apache
-- point your browser at the instal's URL and follow the setup
-To upgrade baikal, you have to follow the setup instructions
-If you're upgrading from 0.2.7, see http://sabre.io/baikal/upgrade/
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 86eff96f7e57..38c1cbef19ea 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,7 +1,5 @@
-DIST owncloud-10.4.0.tar.bz2 20426453 BLAKE2B 7affb3b3ec0d4db810199ef40f96c897c3c0d5d4c1e6e66f6014294dff61226a0d062c1ac70c6d23f377179adebec9c8b9b8afaa5628c7776ea32826f25d373b SHA512 3d95cb0795a33238fc5e3a051699ae831b861a2a9d41111b10fa8347fd06f6f8a3f6b810a2896c81a4de7af4301c6cccda8cad41fcfedb9659ed1ae227e15b20
-DIST owncloud-10.4.1.tar.bz2 20439397 BLAKE2B 1a83d82a3657cb62a69d49293951f8355a156b08791c164c0971505e6be151cd415b0d88157171989162303bf942c6bfce3d22fab291ac18a635fee0e7057343 SHA512 381e31faba9a1853a4c087a218637a2a9c1596189f0867d86b1fa800d7d1488a65d27fdb058b792eed027d0c11a4d582b72044c0b5e751d8509cbd32233c2e85
 DIST owncloud-10.5.0.tar.bz2 23471398 BLAKE2B 6566df51474a22d36da868ab45a7cb679528aecc9a95e0ad20f06adda587563e16c98ee1e942a5fef62e633b132469a6a775d5893754f553aea8a33043daafc3 SHA512 b77183146ee27c97a7f472e1debaec6f5dad168f204a243a65f431cade28ed0551d0db88ff799776bfd26db60357a2216a35cd1b4af6e7e98fc933f325e4336c
-EBUILD owncloud-10.4.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
-EBUILD owncloud-10.4.1.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
+DIST owncloud-10.6.0.tar.bz2 24569416 BLAKE2B f20890262551f2996d39566f63f79439921f41bfa3a82cecc5fdf771be93e403f5a273e76498421ec7e29a03f00326844003c3adb3f927f2c1c8fc82c26c23de SHA512 ec4de23b4cd0dc08dde66802285a00c817cc8ccc79237e4ae454af5fecba102fdc892ed24e62b246deebba536728d312f43dcfea9f2f490ba8847a54ac962885
 EBUILD owncloud-10.5.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
+EBUILD owncloud-10.6.0.ebuild 1252 BLAKE2B cc2efc5b7bc9121b94a034b017cf4f4da390fc1cd0fdf1106b94972c4584cbfccc220f679b6e5d41623294c373343f285158e81fc9381189610607eb86e27f32 SHA512 48268b8e9ed8dc56520b589b36b1749cbf9639080c0de876a3791e68c86421c1817ec956f6fedb4dfb4506aa7aec607fcc531ec31947e6d83aa256bd9d5724e2
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.4.0.ebuild b/www-apps/owncloud/owncloud-10.4.0.ebuild
deleted file mode 100644
index 97ad6449db05..000000000000
--- a/www-apps/owncloud/owncloud-10.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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"
-
-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
-}
diff --git a/www-apps/owncloud/owncloud-10.4.1.ebuild b/www-apps/owncloud/owncloud-10.6.0.ebuild
index 97ad6449db05..cecbee423d8e 100644
--- a/www-apps/owncloud/owncloud-10.4.1.ebuild
+++ b/www-apps/owncloud/owncloud-10.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
index 70751c9f11d5..e186eda4973c 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -1,5 +1,6 @@
-AUX apache-webdavcgi-1.1-example.conf 2621 BLAKE2B 0ef587bc87f08043c5503db0bf04259daf1c047a653203ba1794ce247d340fec722b91334f9a8b2d1af32bddc9b8e3cf1d31118d869816e8d20e46208362e4c1 SHA512 36e440c8274a46c3e415291f08eb1263694bcb512c9c5bfe6b58f8c24b4d665672788500fc31d87b104c4a654458572798a2e92ab913bd4a438e39b4e90e6ac8
+AUX apache-webdavcgi-1.1-example.conf 2613 BLAKE2B 0c6a1cc621b6d1d8ea07fdc6dd11d2ecffaa9f141641ecd696bd440a6978f141f38626d00d6ae84eddaf8c762f95c86c75c9c91a149d63c8db46dee5c8f1b1dc SHA512 54c338d68b18ed91c8a55b9eeb840c0d1f37fc75404f81dfeb351998d3294a04fd04762963c319ce37adee957bc5ad0117363323caf47252e37e934233460aed
 AUX webdav-1.1.conf 4450 BLAKE2B 29c7dcfdc623938d90a060e4e86d70d82bceb03aba95da72c323415dfc501de975a23cacda18929126f219f540da4b015fe6871e02a551ac25b7017268bf7d58 SHA512 4e867f9d8de4eb3f864ddc0671bf048d1a8daa9e01c830045a7adb5ac712c46925f0ed60d5aeba9acb3f9c3fd259411af23c41476f06d38f3d8f3cb2027c51c8
-DIST webdavcgi-1.1.1.tar.bz2 11623234 BLAKE2B a5a2b67f2666ce4180e5ed145045b8552e6e988967d99bad518d72a67a417ce600619b11af9171aa291bb4b98ec0b0c8c3ce56511d65c4e8b8c92932e8da418f SHA512 660b3e54d72c5b96c1fb329d8e0838b1dbf68e1671af3880f7e096bfdfe559909cf3e1e3069fe4877e0ffbd67d24dc4a38c3db8baaae6d62db05bde31cea789f
-EBUILD webdavcgi-1.1.1.ebuild 5736 BLAKE2B 46d043b9252bdf52f75696ee6476489ebf8bde2a208f81d121b504bb4bd1e8b347bb2ae85ab650bb19e2dd6f47779387afb331219fa4e6d7e448699f5469a89d SHA512 e4fb54e0f2fee21772eae95816a4b9fca5179a5231606f904db5f61d50ecab7d1ad6922dc87d022dc199b8af5ff7b642148cc662c1413c73ae378648cc94ac8e
+AUX webdavcgi-1.1.2-fix-unescaped-braces.patch 4681 BLAKE2B fcb31cbbbcb12aba3113693a603373301160997822be2172b02fafd0be97fea0c25a8bcad7196ffce08ea4f437c27a94f808822c49e4a12589dffac9cbe472f0 SHA512 4cc4bf31acd200365777d8b6ec3bdbc2325c81191a4f71308203a38cd0e918861c2432a50b3c11fdd04323ca3403f42541a3bc2aa6a6c1625fc841a836bf7606
+DIST webdavcgi-1.1.2.tar.gz 16844485 BLAKE2B 1a9f1b0b5b4520badaca1992ba51760a6a1b250edeb3debe6bdcb962fb43c3c660a837882bccfa645a466e967c726569113665ff3a3c0f4db88e573299a30582 SHA512 cddd8461bfb16b5d50a9a2bbe270d3b09e973e74d07b2f54a16473c48dbaaab7d561becf223405a03ef6ce45502bf9684e41dc8e9977b0af788d700693946826
+EBUILD webdavcgi-1.1.2.ebuild 6535 BLAKE2B 681db50e69128d224dfca6079236d1e1dbcbf9e90c61948546d7d7e7e5f18ea28a5478ed80ed471f14e39e697a49b2cc9490498464baa30a1b1aa7bbb0d2d5db SHA512 10ce76759f406c07308ef24438da31e856d31fe653f754189bc19e301be573cbd0a1d73ff6c56a45d417d657a7bd1ee2858c7ed60d8eae880a3cf73cb67787b5
 MISC metadata.xml 1040 BLAKE2B fb1efea181e0b46f16e8086c4e183af13f61d4113d9957cb3b9e8ded4894c13e8559989c543cc9bdd326083805d7357c64c8ffc80518ed8fe12945c947cefbb0 SHA512 af3c8574f9b2c376194b27190dd6e1acf2e7a1e01f1becf41b84de395d96e6a6c739ebfb969c772104c8bdac3de4a8e725ad95a10e8a40902595602692bdcddb
diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf
index 4ee926fbd7c7..900e0ba5a2c4 100644
--- a/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf
+++ b/www-apps/webdavcgi/files/apache-webdavcgi-1.1-example.conf
@@ -30,9 +30,10 @@
 #
 # - The WEBDAVCONF environment variable has to point to your configuration
 #
-# For further informations and other configuration possibilities consult the
-# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
-# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
+# For further information and other configuration possibilities consult the
+# WebDAV CGI documentation and Apache HTTP server documentation:
+# * https://danrohde.github.io/webdavcgi/doc.html
+# * https://httpd.apache.org/docs/
 #
     ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-1.1/cgi-bin/webdavwrapper"
     ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-1.1/cgi-bin/logout"
diff --git a/www-apps/webdavcgi/files/webdavcgi-1.1.2-fix-unescaped-braces.patch b/www-apps/webdavcgi/files/webdavcgi-1.1.2-fix-unescaped-braces.patch
new file mode 100644
index 000000000000..3b3262bfd088
--- /dev/null
+++ b/www-apps/webdavcgi/files/webdavcgi-1.1.2-fix-unescaped-braces.patch
@@ -0,0 +1,98 @@
+diff --git a/lib/perl/Requests/WebDAVRequest.pm b/lib/perl/Requests/WebDAVRequest.pm
+index 8d5b89e6..2b6ea4d9 100644
+--- a/lib/perl/Requests/WebDAVRequest.pm
++++ b/lib/perl/Requests/WebDAVRequest.pm
+@@ -134,7 +134,7 @@ sub get_prop_stat {
+     $fn .= $is_dir && $fn !~ /\/$/xms ? q{/} : q{};
+     foreach my $prop ( @{$props} ) {
+         my ( $xmlnsuri, $propname ) = ( 'DAV:', $prop );
+-        if ( $prop =~ /^{([^}]*)}(.*)$/xms ) {
++        if ( $prop =~ /^[{]([^}]*)[}](.*)$/xms ) {
+             ( $xmlnsuri, $propname ) = ( $1, $2 );
+         }
+ 
+diff --git a/lib/perl/WebDAV/Properties.pm b/lib/perl/WebDAV/Properties.pm
+index 2baf319b..a9ee2d73 100644
+--- a/lib/perl/WebDAV/Properties.pm
++++ b/lib/perl/WebDAV/Properties.pm
+@@ -139,7 +139,7 @@ sub set_property {
+     my $rfn = $self->resolve($fn);
+     my $ru  = $REQUEST_URI;
+     my ( $ns, $pn );
+-    if ( $propname =~ /^{([^}]+)}(.*)$/xms ) {
++    if ( $propname =~ /^[{]([^}]+)[}](.*)$/xms ) {
+         ( $ns, $pn ) = ( $1, $2 );
+     }
+ 
+@@ -186,7 +186,7 @@ sub set_property {
+         if (   $parref
+             && ref($parref) eq 'HASH'
+             && ( !${$parref}{xmlns} || ${$parref}{xmlns} eq q{} )
+-            && $n !~ /^{[^}]*}/xms )
++            && $n !~ /^[{][^}]*[}]/xms )
+         {
+             $n = '{}' . $n;
+         }
+diff --git a/lib/perl/WebDAV/XMLHelper.pm b/lib/perl/WebDAV/XMLHelper.pm
+index 10ec2ceb..c8116927 100644
+--- a/lib/perl/WebDAV/XMLHelper.pm
++++ b/lib/perl/WebDAV/XMLHelper.pm
+@@ -229,7 +229,7 @@ sub get_namespace_uri {
+ 
+ sub nonamespace {
+     my ($prop) = @_;
+-    $prop =~ s/^{[^}]*}//xms;
++    $prop =~ s/^[{][^}]*[}]//xms;
+     return $prop;
+ }
+ 
+diff --git a/lib/perl/WebInterface/Common.pm b/lib/perl/WebInterface/Common.pm
+index a4236fae..6fa904cf 100644
+--- a/lib/perl/WebInterface/Common.pm
++++ b/lib/perl/WebInterface/Common.pm
+@@ -562,7 +562,7 @@ sub _get_varref {
+         if ( defined $self->{$str} ) {
+             return $self->{$str};
+         }
+-        if ($str=~/^(.*){(.*?)}/xms) {
++        if ($str=~/^(.*)[{](.*?)[}]/xms) {
+             $ref = $DefaultConfig::{$1}{$2};
+             return $ref;
+         }
+diff --git a/lib/perl/WebInterface/Extension/PropertiesViewer.pm b/lib/perl/WebInterface/Extension/PropertiesViewer.pm
+index 2f6223e8..be7ba438 100644
+--- a/lib/perl/WebInterface/Extension/PropertiesViewer.pm
++++ b/lib/perl/WebInterface/Extension/PropertiesViewer.pm
+@@ -157,7 +157,7 @@ sub _render_viewer {
+         my $title = create_xml( $r200{prop},        1 );
+         my $value = create_xml( $r200{prop}{$prop}, 1 );
+         my $namespace = get_namespace_uri($prop);
+-        if ( $prop =~ /^{([^}]*)}/xms ) {
++        if ( $prop =~ /^[{]([^}]*)[}]/xms ) {
+             $namespace = $1;
+         }
+         push @bgstyleclasses, shift @bgstyleclasses;
+diff --git a/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm b/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm
+index 44cfd894..972d431f 100644
+--- a/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm
++++ b/lib/perl/WebInterface/View/Simple/RenderFileListTable.pm
+@@ -85,7 +85,7 @@ sub render_file_list_table {
+         unselectable => $self->is_unselectable($fn)        ? 'yes' : 'no',
+     );
+     $filelisttabletemplate =~
+-        s/[\$]{?(\w+)}?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/xmegs;
++        s/[\$][{]?(\w+)[}]?/exists $stdvars{$1} && defined $stdvars{$1}?$stdvars{$1}:"\$$1"/xmegs;
+     my %jsondata = (
+         content => $self->minify_html(
+             $self->render_template( $fn, $ru, $filelisttabletemplate )
+@@ -253,8 +253,8 @@ sub _render_file_list_entry {
+     my $displayname = $self->{cgi}->escapeHTML( $self->{backend}->getDisplayName($full) );
+     my $now = $self->{c}{_render_file_list_entry}{now}{$lang} //= DateTime->now( locale => $lang );
+     my $cct = $self->can_create_thumb($full);
+-    my $u   = $self->{c}{_render_file_list_entry}{uid}{$uid // 'unknown'} //= $uid && $uid=~/^\d+$/xms ? scalar getpwuid( $uid ) : $uid ? $uid : 'unknown';
+-    my $g   = $self->{c}{_render_file_list_entry}{gid}{$gid // 'unknown'} //= $gid && $gid=~/^\d+$/xms ? scalar getgrgid( $gid ) : $gid ? $gid : 'unknown';
++    my $u   = $self->{c}{_render_file_list_entry}{uid}{$uid // 'unknown'} //= $uid && $uid=~/^\d+$/xms ? scalar getpwuid( $uid ) // $uid: $uid ? $uid : 'unknown';
++    my $g   = $self->{c}{_render_file_list_entry}{gid}{$gid // 'unknown'} //= $gid && $gid=~/^\d+$/xms ? scalar getgrgid( $gid ) // $gid: $gid ? $gid : 'unknown';
+     my $icon = $self->{c}{_render_file_list_entry}{icon}{$mime}
+         //= $self->get_icon($mime);
+     my $enthumb = $self->{c}{_render_file_list_entry}{cookie}{thumbnails}
diff --git a/www-apps/webdavcgi/webdavcgi-1.1.1.ebuild b/www-apps/webdavcgi/webdavcgi-1.1.2.ebuild
index 54da3b6b4416..b9ddf2f7e102 100644
--- a/www-apps/webdavcgi/webdavcgi-1.1.1.ebuild
+++ b/www-apps/webdavcgi/webdavcgi-1.1.2.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs versionator
+inherit toolchain-funcs
 
 DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV."
-HOMEPAGE="http://webdavcgi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://danrohde.github.io/webdavcgi/"
+SRC_URI="https://github.com/DanRohde/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 
 # Provide slotting on minor versions. WebDAV CGI is a web application which
 # can be shared by multiple instances and thus major updates shouldn't be
 # enforced to all users/instances at the same time.
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 
 KEYWORDS="~amd64"
 IUSE="afs git kerberos ldap mysql pdf postgres rcs samba +sqlite +suid"
@@ -27,6 +27,7 @@ RDEPEND="afs? ( net-fs/openafs )
 	dev-perl/DateTime
 	dev-perl/DateTime-Format-Human-Duration
 	dev-perl/File-Copy-Link
+	dev-perl/IO-Compress-Brotli
 	dev-perl/JSON
 	dev-perl/List-MoreUtils
 	dev-perl/MIME-tools
@@ -55,6 +56,16 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 CGIBINDIR="cgi-bin"
 
+PATCHES=(
+	# Fix unescaped braces, which adresses #674772 and #658470
+	#
+	# The patch originates from
+	# https://github.com/DanRohde/webdavcgi/commit/04e79b7ecbaf3aae5ab813cd4fc0a009c72b1580
+	# and can be remove as soon as this ebuild gets bumped to 1.1.3 which
+	# already includes the change.
+	"${FILESDIR}/${P}-fix-unescaped-braces.patch"
+)
+
 src_compile() {
 	if use suid; then
 		WEBDAVWRAPPERS="webdavwrapper" # Standard UID/GID wrapper
@@ -146,7 +157,7 @@ src_install() {
 	dodoc CHANGELOG
 	dodoc etc/webdav.conf.complete
 	dodoc "${FILESDIR}/${APACHEEXAMPLECONFIG}"
-	dodoc -r "doc/"
+	dodoc -r "docs/"
 }
 
 pkg_postinst() {
@@ -162,23 +173,34 @@ pkg_postinst() {
 	elog "The WebDAV CGI config is located at ${WEBDAVCONFIG}."
 	elog
 	elog "An example Apache HTTP server configuration snippet is available in"
-	elog "${ROOT%/}/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
+	elog "${EROOT}/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
 	elog
 	elog "An important note to systemd user's running the Apache HTTP server:"
+	elog ""
 	elog "The default apache2.service will be started with private file system"
-	elog "namespaces for /var/tmp and /tmp enabled (PrivateTmp=true)."
+	elog "namespaces for /var/tmp and /tmp enabled (PrivateTmp=true) and with"
+	elog "restricted privileges and securebits flags (NoNewPrivileges=true"
+	elog "SecureBits=noroot-locked)"
+	elog ""
 	elog "This means that you either need to disable PrivateTmp, relocate the"
 	elog "directories starting with /var/tmp within ${WEBDAVCONFIG}"
 	elog "or pre-create the directory structure with a user defined systemd"
 	elog "companion unit using the JoinsNamespaceOf directive."
+	elog ""
+	elog "For those using the setuid/guid webdavwrapper, additional systemd"
+	elog "execution environment relaxation is required."
 	elog
-	elog "To disable the private file system namespace, override the existing"
-	elog "service:"
+	elog "To override the existing systemd service unit:"
 	elog "systemctl edit apache2.service"
+	elog ""
 	elog "[Service]"
+	elog "# Disable private file system namespaces"
 	elog "PrivateTmp=false"
+	elog "# Uncomment the following if you're using the setuid/guid webdavwrapper"
+	elog "#NoNewPrivileges=false"
+	elog "#SecureBits="
 
 	einfo
 	einfo "Detailed installation and configuration instructions can be found at"
-	einfo "http://webdavcgi.sourceforge.net/"
+	einfo "https://danrohde.github.io/webdavcgi/doc.html"
 }