From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- www-apps/davical/Manifest | 2 + www-apps/davical/davical-1.1.9.3-r1.ebuild | 73 ++++++++++++++++++++++ .../files/davical-1.1.9.3-php8_compatibility.patch | 58 +++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 www-apps/davical/davical-1.1.9.3-r1.ebuild create mode 100644 www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch (limited to 'www-apps/davical') diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest index e14a97b30aaa..28713a2188b9 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -1,6 +1,8 @@ +AUX davical-1.1.9.3-php8_compatibility.patch 1978 BLAKE2B fa49a36e29f490cf93b9dc68e06ec9eae317c01e68f4e201fe51b049c1279c124c586553ef2a6e472ff955e0592def7983aa66af44083e4051bf7aa8d9db2a38 SHA512 2c2e7bd99e661bd7f1b0fa39e31b4eb883bd1a726820d199c319017636aa02a206cb5f25b41e21125a8dab369038ba89d624079f3920d6ebd1f5469c8c0ca653 AUX postinstall-en.txt 201 BLAKE2B 4e4ff030cb8031785d62b17e83b7bb2e40124466081b407e7638cb41a9045cb478f8e71a2122005668047620a7fff644a0ae069b924709139ac6d87edf527e57 SHA512 a35c6e0700a047d39f5f685c5ef9453a430cc871f3c965b859dfbd9564953e2cb7ae6dabe59e4efe23fbbd971500c20c1d7174398d9e8e66cdc4d3ccc03ac988 AUX postupgrade-en.txt 218 BLAKE2B 83d752f4a76637ac90d65b7c458c7dadb44a2d5ba496419ce71c9763793abbd95b97b0ead133fe7afd1b2b4b382dc00149d9b6135fa2430300281741ed2a8d34 SHA512 0154d820ed27e43f091d535550dc61fdb91faaf303926cd3a2ba16300b963d0ea5226015fc546cb6419c9df82ab7e99f0f05287b4a5240c2ea381a43ec8e52d3 AUX vhost-example 366 BLAKE2B 2aef55fee2759d1063936a583cdf6b96fcab77a0d6b056d59390931327ebcfdc338a515a8f7d9cfc5a6f071e0266fa82f0b6b3b4bab97979ff4dd8231fa2d729 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9 DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6 +EBUILD davical-1.1.9.3-r1.ebuild 1788 BLAKE2B b46528deab3559d94a3c84e3f022823d40d8eada03b470e6519020c1ab8b3605774d041278193a2688080ca4294e1f39244ffb51c8888f15966255151793dff5 SHA512 7cf4f9efd719214c38bf28bbc4ac3081d36b9fa7d55eca571ac9e25d5e8373a4afb6b7f446b91d0ee5a1947d082108bd33647962f2c129bf79a6993d40318e49 EBUILD davical-1.1.9.3.ebuild 1736 BLAKE2B d10c9a3af1d34ef20912dfa4929ebc63fdf79f83c18d1d08fc4e7625d3b603416100bcfbd170c208c7bc4e33d621f71e9af4cdc41009b59b690f1eb639f39ef6 SHA512 250d2e292f9e4b074876ef8ae742272e4ffe502f0c711636dc6f756e8d8f8529c80e01c21d43bec3cc7171ac6f9033b8fd324068362cdb3e8ba680196bb10329 MISC metadata.xml 488 BLAKE2B 415da89c18eca6883cead611be82292f6f3936c01e81db2166e0bdaf5d73dafb550546c0639da311e2f7685a98175212bfe9c9709ec2ff0fab7e00cbf39ed1fe SHA512 6d0e48e689eabd408efa8addab142c14a199ac62b16350f56fcd238f470094c108a56db1719961dc5a80d906102b069ee47e99aef64677cf765be0d79a754485 diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild new file mode 100644 index 000000000000..4b2bc1b3ed47 --- /dev/null +++ b/www-apps/davical/davical-1.1.9.3-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit webapp + +DESCRIPTION="A CalDAV and CardDAV Server" +HOMEPAGE="https://www.davical.org/" +SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2.1+ LGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="ldap" + +BDEPEND="sys-devel/gettext" + +# >=dev-lang/php-8:curly braces string offset access was removed (Bug 764908) +RDEPEND="app-admin/pwgen + dev-lang/php[calendar,curl,iconv,imap,ldap?,nls,pdo,postgres,xml] + dev-perl/DBD-Pg + dev-perl/DBI + dev-perl/YAML + >=dev-php/awl-0.61 + virtual/httpd-php" + +PATCHES=( "${FILESDIR}/${P}-php8_compatibility.patch" ) + +need_httpd + +S="${WORKDIR}" + +src_compile() { + emake built-locale +} + +src_install() { + webapp_src_preinst + + einstalldocs + + einfo "Installing web files" + insinto "${MY_HTDOCSDIR}" + doins -r htdocs/. htdocs/.htaccess + + einfo "Installing main files and i18n" + insinto "${MY_HOSTROOTDIR}/${PN}" + doins -r inc locale + rm "${ED}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die + + einfo "Installing sql files" + insinto "${MY_SQLSCRIPTSDIR}" + doins -r dba/. + + insinto /etc/${PN} + doins -r config/. "${FILESDIR}/vhost-example" + + webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" + webapp_postupgrade_txt en "${FILESDIR}/postupgrade-en.txt" + webapp_src_install + + fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" + fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" +} + +pkg_postinst() { + elog "If you are upgrading from a previous version of davical, don't forget to" + elog "upgrade the database structure with" + elog " cd /usr/share/webapps/davical/${PVR}/sqlscripts/" + elog " ./update-davical-database -dbuser xxxxxxx -appuser xxxxxx" + + webapp_pkg_postinst +} diff --git a/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch new file mode 100644 index 000000000000..de9db47ff7fe --- /dev/null +++ b/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch @@ -0,0 +1,58 @@ +From f376be164eacf51d7354c728094e697ee2336218 Mon Sep 17 00:00:00 2001 +From: Jan Hicken +Date: Sun, 31 Jan 2021 11:46:32 +0100 +Subject: [PATCH 1/2] Use brackets instead of curly braces for string offset + access + +Curly braces have been deprecated in PHP 7.4 and unsupported in PHP 8.0. +--- + inc/check_UTF8.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/check_UTF8.php b/inc/check_UTF8.php +index e3c93dbf..62dbfc00 100644 +--- a/inc/check_UTF8.php ++++ b/inc/check_UTF8.php +@@ -67,7 +67,7 @@ function utf8ToUnicode(&$str) + + $len = strlen($str); + for($i = 0; $i < $len; $i++) { +- $in = ord($str{$i}); ++ $in = ord($str[$i]); + if (0 == $mState) { + // When mState is zero we expect either a US-ASCII character or a + // multi-octet sequence. +-- +GitLab + + +From 6cdbfcf226f0235a00206edfd119fcc90465a2b8 Mon Sep 17 00:00:00 2001 +From: Jan Hicken +Date: Sun, 31 Jan 2021 11:47:41 +0100 +Subject: [PATCH 2/2] Add default value for errcontext variable in error + handler function + +This variable is no longer passed in PHP 8.0. + +It cannot be removed however, because it would not be backwards +compatible. +--- + htdocs/setup.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/htdocs/setup.php b/htdocs/setup.php +index 8b13d0ad..2a82dbf3 100644 +--- a/htdocs/setup.php ++++ b/htdocs/setup.php +@@ -13,7 +13,7 @@ function log_setup_error($errno , $errstr , $errfile , $errline) { + error_log('DAViCal setup.php: Informational: '.$errfile.'('.$errline.'): ['.$errno.'] '.$errstr); + } + +-function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext ) { ++function catch_setup_errors($errno , $errstr , $errfile , $errline , $errcontext = null ) { + if ( $errno == 2 ) { + // A working installation will regularly fail to include_once() for several files as it searches for the location + log_setup_error($errno , $errstr , $errfile , $errline); +-- +GitLab + -- cgit v1.2.3