commit: fbca1524f7862e080fd237583352af0686dc30ac Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Thu Jul 27 19:56:09 2023 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Thu Jul 27 19:56:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbca1524
www-apps/davical: drop 1.1.9.3, 1.1.9.3-r1, 1.1.10 Need to get rid of some old versions before masking php-7.4. Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> www-apps/davical/Manifest | 2 - 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, 277 deletions(-) diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest index cc13c34b5d5f..7d2d5b00161f 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -1,3 +1 @@ -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 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-lang/php-8:*[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" - -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 <[email protected]> -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 <[email protected]> -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 -
