From ebac931cc23ca55abe982e67b9a4f06f748d0bef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Jul 2023 22:35:23 +0100 Subject: gentoo auto-resync : 27:07:2023 - 22:35:23 --- www-apps/davical/Manifest | 6 -- www-apps/davical/davical-1.1.10.ebuild | 72 --------------------- www-apps/davical/davical-1.1.9.3-r1.ebuild | 74 ---------------------- www-apps/davical/davical-1.1.9.3.ebuild | 71 --------------------- .../files/davical-1.1.9.3-php8_compatibility.patch | 58 ----------------- 5 files changed, 281 deletions(-) delete mode 100644 www-apps/davical/davical-1.1.10.ebuild delete mode 100644 www-apps/davical/davical-1.1.9.3-r1.ebuild delete mode 100644 www-apps/davical/davical-1.1.9.3.ebuild delete 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 6324ef4149f7..b96718334e44 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -1,12 +1,6 @@ -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.10.tar.xz 1367356 BLAKE2B e93be0e4ce2768e13635247d006792a40865bcbe95698fa5bc7a7a20503acae0c1adbc1a2573f84043e4606342a468c5a606dab4c025edc9e68dae9a5d9aa10e SHA512 d307fc600c50bd294497ff9ab8fdc7a2d966e5360acb8babe3549a754204bbc73a44b89a1c4347f9527cf4f99e0091afc9bf92bbdd46e6843b5830489ad911aa DIST davical-1.1.11.tar.xz 1371432 BLAKE2B a1779175dfe112189e3e3fb8c317c568e8bac62ef15588058f9ac1cda61ede9c2f538da24bff2678f0457e1636538d12801c38dbb884ad9e0bc44482045bb07b SHA512 263bd11ca73c54689de3c3eefbadd9bcd99a88b60ce0922702584b42183302aa1e0dbee9559329d8789daae177f6e916dee803019e9059c6bc4ab1a855889d8f -DIST davical-1.1.9.3.tar.xz 1359608 BLAKE2B d936fa5809413eac92e996262074972a04e1ac2d50d06c921e0f70468dde2b67175c6463d73ead09d5b2bce4ab1c2a02ccb45b64ee43066f6a9609c5ccdd01ee SHA512 cad28a991900d4cd9b1f86aeda7861482eef8707a02a371af53bd9cd17f9b5417ae81ccf1129d01fa5786f7bc9edc7478eb5a7274147039ce3ef603874c093a6 -EBUILD davical-1.1.10.ebuild 1709 BLAKE2B 61cb76855a9b3ce989542b5b350af870629ef3bb6175d5fc2ed4ab1d10eec8a8211379b1961cb9653ab36d44d69029e7e8440b4809d36e3ee2c11d2d4cd36cbe SHA512 fc448150c73f5038c913f4725348dd7452816ade1710ce6a8296bc7d870214105b111046d9205f65b747649ae1f545c3fdec945b74f1f502cc48e5cd1abe70a3 EBUILD davical-1.1.11.ebuild 1709 BLAKE2B 5d37fa4201d6c9aaefd34af7080c655fc969a95aad0ccdfec7ef1971914911c8fab291e6c5227218adc1beb3fd283200cb961534a658067781c5b1e9bea339fc SHA512 dff28c4a6f501efe71d91cf83cde1821c30dbf3a598597b17ca4dd2eb36e169bb8599ad335f2a111f4e931786856fcaa251b877055c9ff19766bd1f457f9dd51 -EBUILD davical-1.1.9.3-r1.ebuild 1766 BLAKE2B 8a66d49977907924d5e9b33df06996bc88663d6ff5f87decfe308e3abdbb20a12f99a5de59e22d6397feefbe0c92242f7a3750567d15b44a3b0ead8311afc4f1 SHA512 56daf4c83660613371c6aba7e2530faedc5b8b1cbe9e2df58a8ca88db5cb75cecaa6af51cb45c5bed25a199cb8857e1762538ac37158abef64cb0ec79776a547 -EBUILD davical-1.1.9.3.ebuild 1736 BLAKE2B d10c9a3af1d34ef20912dfa4929ebc63fdf79f83c18d1d08fc4e7625d3b603416100bcfbd170c208c7bc4e33d621f71e9af4cdc41009b59b690f1eb639f39ef6 SHA512 250d2e292f9e4b074876ef8ae742272e4ffe502f0c711636dc6f756e8d8f8529c80e01c21d43bec3cc7171ac6f9033b8fd324068362cdb3e8ba680196bb10329 MISC metadata.xml 519 BLAKE2B 7b92b6bc8b09d51d4f959a6da70571542d3aa04ecd98d7cc1a2583daa4f923bb56204beac7bc2ebe10f748b026f46171522cdcc91321fc75236551304b142e5e SHA512 40d2e80ac3f514d3303f0941c768397343bb1371966a8afd19143b03cb4838dab333d120d46df970ba83afa25f99a2bd0622f4d4216b637a7f49e86e9988446f diff --git a/www-apps/davical/davical-1.1.10.ebuild b/www-apps/davical/davical-1.1.10.ebuild deleted file mode 100644 index 55191dde88dd..000000000000 --- a/www-apps/davical/davical-1.1.10.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature 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" - -BDEPEND="sys-devel/gettext" - -RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,iconv,imap,nls,pdo,postgres,xml] - dev-perl/DBD-Pg - dev-perl/DBI - dev-perl/YAML - >=dev-php/awl-0.62 - virtual/httpd-php" - -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 - - elog "" - optfeature "LDAP authentication" dev-lang/php[ldap] -} diff --git a/www-apps/davical/davical-1.1.9.3-r1.ebuild b/www-apps/davical/davical-1.1.9.3-r1.ebuild deleted file mode 100644 index 88a416b0be46..000000000000 --- a/www-apps/davical/davical-1.1.9.3-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature 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" - -BDEPEND="sys-devel/gettext" - -RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,iconv,imap,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 - - elog "" - optfeature "LDAP authentication" dev-lang/php[ldap] -} diff --git a/www-apps/davical/davical-1.1.9.3.ebuild b/www-apps/davical/davical-1.1.9.3.ebuild deleted file mode 100644 index 99d1d74b7ebe..000000000000 --- a/www-apps/davical/davical-1.1.9.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# 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-php/awl-0.61 - virtual/httpd-php" - -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 deleted file mode 100644 index de9db47ff7fe..000000000000 --- a/www-apps/davical/files/davical-1.1.9.3-php8_compatibility.patch +++ /dev/null @@ -1,58 +0,0 @@ -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