From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96F811581FB for ; Fri, 30 Aug 2024 09:27:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EED0E29F0; Fri, 30 Aug 2024 09:27:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4431BE29F0 for ; Fri, 30 Aug 2024 09:27:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2788034301B for ; Fri, 30 Aug 2024 09:27:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FBF41A88 for ; Fri, 30 Aug 2024 09:27:40 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1725009914.f1b51008ed603e16c0a87258087e5f6e585eae3d.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/dokuwiki/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/dokuwiki/Manifest www-apps/dokuwiki/dokuwiki-20240206b.ebuild X-VCS-Directories: www-apps/dokuwiki/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: f1b51008ed603e16c0a87258087e5f6e585eae3d X-VCS-Branch: master Date: Fri, 30 Aug 2024 09:27:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d9b427b-3a7b-4bff-a718-b07276ee785a X-Archives-Hash: 1d6f1f8f4db827cc7210c8ee3acf5753 commit: f1b51008ed603e16c0a87258087e5f6e585eae3d Author: Viorel Munteanu gentoo org> AuthorDate: Fri Aug 30 09:25:14 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Fri Aug 30 09:25:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b51008 www-apps/dokuwiki: add 20240206b Security update. Bug: https://bugs.gentoo.org/938729 Signed-off-by: Viorel Munteanu gentoo.org> www-apps/dokuwiki/Manifest | 1 + www-apps/dokuwiki/dokuwiki-20240206b.ebuild | 85 +++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest index d8f9e704ea1a..b4637d6a5cf9 100644 --- a/www-apps/dokuwiki/Manifest +++ b/www-apps/dokuwiki/Manifest @@ -1,2 +1,3 @@ DIST dokuwiki-2023-04-04a.tgz 4043928 BLAKE2B a18372b04bd10760236ec4f976a87fed800601a541ebb6aaa07b302c8462286da3094aa102194a101c59ceacde99d0c865f938b8eb732cf09e8e7f0b5f40ea8e SHA512 748af27b2d226437f87461522254fca5e65c7572fdc20e75259944b388e3888a85f61120d1c22c671d3a302ac6791e463a0d3418f2fcf23bf046116107b11ab8 DIST dokuwiki-2024-02-06a.tgz 4201385 BLAKE2B 3e4541f7e13e400e791af57a3caf7274b5ec7f4608396f7ff91c60f2991f7aea0db2b142a7425d1057a9fb2297200b8b85cbe55af592105927f333dfa228ba44 SHA512 280e450f47237f834256a3a6cd81efe74c82b24b06033d09485bba640d4fd5de72d4fa62129323a6a5f37796357cbe8d3dd1f31b658ca85819e4c9fc47665e2c +DIST dokuwiki-2024-02-06b.tgz 4206676 BLAKE2B d9d01723f0dca747fb5d7c99057c22af916879be05f3d7048af37d51552efeae328231dabd321c03ab7dd09474157372ec95846c5d80f9eb111ce3eb67210c42 SHA512 6edaa8baaf5f1c090476e98fff94f14ef71ea1293c8f7e329cee62dacab6e5f49e7fb016e238c96f0e770927c69e7800d98cce2f2a52aa3d1fefd4c869f1bb4a diff --git a/www-apps/dokuwiki/dokuwiki-20240206b.ebuild b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild new file mode 100644 index 000000000000..80ace2977efa --- /dev/null +++ b/www-apps/dokuwiki/dokuwiki-20240206b.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit webapp + +# upstream uses dashes in the datestamp +MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" + +if [[ ${PV} == *rc* ]]; then + MY_PV="${MY_BASE_PV}${PV:8:4}" + MY_P="${PN}-rc-${MY_BASE_PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-rc.tgz -> ${PN}-${PV}.tgz" +else + MY_PV="${MY_BASE_PV}${PV:8:4}" + SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs" +HOMEPAGE="https://wiki.dokuwiki.org" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~sparc ~x86" +IUSE="gd" + +RDEPEND=" + >=dev-lang/php-8.0[xml] + virtual/httpd-php:* + gd? ( || + ( + dev-lang/php[gd] + media-gfx/imagemagick + ) + ) +" + +need_httpd_cgi + +src_prepare() { + # create initial changes file + touch data/changes.log + + default +} + +src_install() { + webapp_src_preinst + + dodoc README + rm -f README COPYING + + docinto scripts + dodoc bin/* + rm -rf bin + + insinto "${MY_HTDOCSDIR}" + doins -r . + + # Copy custom .htaccess that works with both apache 2.2 and 2.4 + for dir in "conf" "data" "inc" "inc/lang"; do + insinto "${MY_HTDOCSDIR}/${dir}" + newins "${FILESDIR}/htaccess" ".htaccess" + done + + # Use custom .htaccess.dist that works with both apache 2.2 and 2.4 + insinto "${MY_HTDOCSDIR}/" + newins "${FILESDIR}/htaccess-dist" ".htaccess.dist" + + for x in $(find data/ -not -name '.htaccess'); do + webapp_serverowned "${MY_HTDOCSDIR}"/${x} + done + + webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist + webapp_configfile "${MY_HTDOCSDIR}"/conf + + for x in $(find conf/ -not -name 'msg'); do + webapp_configfile "${MY_HTDOCSDIR}"/${x} + done + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_src_install +}