Attachment 231437 Details for Bug 261542 – patch

[patch] patch

31a2eae770.patch (text/plain), 12.29 KB, created by Ivan Rozhuk on 2022-01-30 01:32:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2022-01-30 01:32:29 UTC

Size: 12.29 KB

patch

obsolete

>From 31a2eae770ed402eff91e4db2d83ca39e3d42488 Mon Sep 17 00:00:00 2001
>From: Rozhuk Ivan <rozhuk.im@gmail.com>
>Date: Sat, 29 Jan 2022 04:40:43 +0300
>Subject: [PATCH] www/dokuwiki-devel: add port
>
>---
> www/dokuwiki-devel/Makefile                   | 171 ++++++++++++++++++
> www/dokuwiki-devel/distinfo                   |  21 +++
> www/dokuwiki-devel/files/patch-wrong-2388-fix |  11 ++
> www/dokuwiki-devel/files/pkg-message.in       |  25 +++
> www/dokuwiki-devel/pkg-descr                  |   8 +
> 5 files changed, 236 insertions(+)
> create mode 100644 www/dokuwiki-devel/Makefile
> create mode 100644 www/dokuwiki-devel/distinfo
> create mode 100644 www/dokuwiki-devel/files/patch-wrong-2388-fix
> create mode 100644 www/dokuwiki-devel/files/pkg-message.in
> create mode 100644 www/dokuwiki-devel/pkg-descr
>
>diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
>new file mode 100644
>index 000000000000..bb15b9729f14
>--- /dev/null
>+++ b/www/dokuwiki-devel/Makefile
>@@ -0,0 +1,171 @@
>+PORTNAME=	dokuwiki
>+PORTVERSION=	20220127
>+CATEGORIES=	www
>+PKGNAMESUFFIX=	-devel
>+
>+MAINTAINER=	rozhuk.im@gmail.com
>+COMMENT=	Simple and easy to use wiki, no database required
>+
>+LICENSE=		BSD3CLAUSE GPLv2 GPLv2+ GPLv3 MIT
>+LICENSE_COMB=		multi
>+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/vendor/simplepie/simplepie/LICENSE.txt
>+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
>+LICENSE_FILE_GPLv2+ =	${WRKSRC}/vendor/geshi/geshi/LICENSE
>+LICENSE_FILE_GPLv3=	${WRKSRC}/vendor/marcusschwarz/lesserphp/LICENSE
>+LICENSE_FILE_MIT=	${WRKSRC}/vendor/composer/LICENSE
>+
>+CONFLICTS_INSTALL=	dokuwiki
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	splitbrain
>+GH_TAGNAME=	4ef5d38db53e045a81f129b29a8b886cecc38497
>+USES=		cpe php:web shebangfix
>+USE_PHP=	gd hash json mbstring openssl pcre session xml zlib
>+NO_ARCH=	YES
>+NO_BUILD=	YES
>+
>+SHEBANG_FILES=	bin/*.php
>+SUB_FILES=	pkg-message
>+SUB_LIST+=	PORTNAME=${PORTNAME}
>+SHAREOWN=	${WWWOWN}
>+SHAREGRP=	${WWWGRP}
>+CONF_FILES=	acl.auth.php local.php local.php.bak plugins.local.php \
>+		plugins.local.php.bak users.auth.php
>+
>+OPTIONS_GROUP=	PLUGINS
>+OPTIONS_GROUP_PLUGINS=	CATLIST CLEANUP CUSTOMBUTTONS EDITTABLE MOVE \
>+			SEARCHINDEX TAG TRANSLATION UPGRADE
>+OPTIONS_SUB=	yes
>+
>+CATLIST_DESC=		Adds a form to create a new page in the current namespace
>+CATLIST_DIRS=		catlist
>+CATLIST_GH_ACCOUNT=	xif-fr:plugin_catlist
>+CATLIST_GH_PROJECT=	dokuwiki-plugin-catlist:plugin_catlist
>+CATLIST_GH_TAGNAME=	065f8d2f4817409989b9342b901163452fb9f547:plugin_catlist
>+
>+CLEANUP_DESC=		Perform file cleanup in the wiki
>+CLEANUP_DIRS=		cleanup
>+CLEANUP_GH_ACCOUNT=	cosmocode:plugin_cleanup
>+CLEANUP_GH_PROJECT=	dokuwiki-plugin-cleanup:plugin_cleanup
>+CLEANUP_GH_TAGNAME=	dc8184bc282ab1ef78586026d5dced37c5705eb6:plugin_cleanup
>+
>+CUSTOMBUTTONS_DESC=	Adding custom buttons to the toolbar
>+CUSTOMBUTTONS_DIRS=	custombuttons
>+CUSTOMBUTTONS_GH_ACCOUNT= ConX:plugin_custombuttons
>+CUSTOMBUTTONS_GH_PROJECT= dokuwiki-plugin-custombuttons:plugin_custombuttons
>+CUSTOMBUTTONS_GH_TAGNAME= fe62df3de7f643225d6767b481f478e901f35a40:plugin_custombuttons
>+
>+EDITTABLE_DESC=		Provides a visual table editing and inserting interface
>+EDITTABLE_DIRS=		edittable
>+EDITTABLE_GH_ACCOUNT=	cosmocode:plugin_edittable
>+EDITTABLE_GH_PROJECT=	edittable:plugin_edittable
>+EDITTABLE_GH_TAGNAME=	3e7b1bdcbf8a188f6f2f3b97232f3ccbed899645:plugin_edittable
>+
>+MOVE_DESC=		Extended edit functions such as renaming or deleting a page
>+MOVE_DIRS=		move
>+MOVE_GH_ACCOUNT=	michitux:plugin_move
>+MOVE_GH_PROJECT=	dokuwiki-plugin-move:plugin_move
>+MOVE_GH_TAGNAME=	f2416147498d9b33e36445820b54e015f1968776:plugin_move
>+
>+SEARCHINDEX_DESC=	Rebuild the search index
>+SEARCHINDEX_DIRS=	searchindex
>+SEARCHINDEX_GH_ACCOUNT=	splitbrain:plugin_searchindex
>+SEARCHINDEX_GH_PROJECT=	dokuwiki-plugin-searchindex:plugin_searchindex
>+SEARCHINDEX_GH_TAGNAME=	32e56a59996ea3a10b3a70f0239fc13d58f1174b:plugin_searchindex
>+
>+TAG_DESC=		Assign category tags to wiki pages
>+TAG_DIRS=		tag
>+TAG_GH_ACCOUNT=		dokufreaks:plugin_tag
>+TAG_GH_PROJECT=		plugin-tag:plugin_tag
>+TAG_GH_TAGNAME=		43e7b584f35e6242758fdf42b45e96571abb1ef1:plugin_tag
>+
>+TRANSLATION_DESC=	Help with translation efforts in a multilingual wiki
>+TRANSLATION_DIRS=	translation
>+TRANSLATION_GH_ACCOUNT=	splitbrain:plugin_translation
>+TRANSLATION_GH_PROJECT=	dokuwiki-plugin-translation:plugin_translation
>+TRANSLATION_GH_TAGNAME=	c3bb052a4dbd63809835e68809b904fafb5e613e:plugin_translation
>+
>+UPGRADE_DESC=		Update with a few clicks from the admin interface
>+UPGRADE_DIRS=		upgrade
>+UPGRADE_GH_ACCOUNT=	splitbrain:plugin_upgrade
>+UPGRADE_GH_PROJECT=	dokuwiki-plugin-upgrade:plugin_upgrade
>+UPGRADE_GH_TAGNAME=	dd8327d13a27f455530fc12f7b0cfaeca0b415b3:plugin_upgrade
>+
>+post-extract-CATLIST-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/catlist/
>+	@${MV} ${WRKSRC_plugin_catlist}/* ${WRKSRC}/lib/plugins/catlist/
>+
>+post-extract-CLEANUP-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/cleanup/
>+	@${MV} ${WRKSRC_plugin_cleanup}/* ${WRKSRC}/lib/plugins/cleanup/
>+
>+post-extract-CUSTOMBUTTONS-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/custombuttons/
>+	@${MV} ${WRKSRC_plugin_custombuttons}/* ${WRKSRC}/lib/plugins/custombuttons/
>+
>+post-extract-EDITTABLE-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/edittable/
>+	@${MV} ${WRKSRC_plugin_edittable}/* ${WRKSRC}/lib/plugins/edittable/
>+
>+post-extract-MOVE-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/move/
>+	@${MV} ${WRKSRC_plugin_move}/* ${WRKSRC}/lib/plugins/move/
>+
>+post-extract-SEARCHINDEX-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/searchindex/
>+	@${MV} ${WRKSRC_plugin_searchindex}/* ${WRKSRC}/lib/plugins/searchindex/
>+
>+post-extract-TAG-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/tag/
>+	@${MV} ${WRKSRC_plugin_tag}/* ${WRKSRC}/lib/plugins/tag/
>+
>+post-extract-TRANSLATION-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/translation/
>+	@${MV} ${WRKSRC_plugin_translation}/* ${WRKSRC}/lib/plugins/translation/
>+
>+post-extract-UPGRADE-on:
>+	@${MKDIR} ${WRKSRC}/lib/plugins/upgrade/
>+	@${MV} ${WRKSRC_plugin_upgrade}/* ${WRKSRC}/lib/plugins/upgrade/
>+
>+do-install:
>+	# Prepare.
>+	@${FIND} ${WRKSRC} -type f $ \
>+		-name '*.orig' \
>+		-o -name '*.bak' \
>+		-o -name 'deleted.files' \
>+		-o -name '.gitignore' $ -delete
>+	@${FIND} ${WRKSRC}/conf -type f $ \
>+		-name '*.php' \
>+		-o -name '*.conf' \
>+		-o -name '*.json' \
>+		$ -exec ${MV} {} {}.sample \;
>+	@${FIND} ${WRKSRC}/lib/plugins -type f $ \
>+		-name 'default.php' \
>+		-o -name 'metadata.php' \
>+		$ -exec ${MV} {} {}.sample \;
>+	# Create empty config files to set perm on install.
>+.for __FILE in ${CONF_FILES}
>+	@${TOUCH} "${WWWDIR}/conf/${__FILE}"
>+.endfor
>+	# Install base files.
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
>+
>+post-stage:
>+	# Generate plist.
>+	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | \
>+		${GREP} -v ^\/ | \
>+		${SED} -e 's|%%WWWDIR%%|www/${PORTNAME}|' \
>+			-e 's|%%PORTEXAMPLES%%||' \
>+			-e 's|%%EXAMPLESDIR%%|share/examples/${PORTNAME}|' \
>+			> ${TMPPLIST}
>+	# Mark config files as samples in plist.
>+	@${REINPLACE_CMD} -E "s|(.*\.sample)$$|@sample \1|" ${TMPPLIST}
>+	# Force perms.
>+	@${ECHO_CMD} "@postexec chown -R root:${WWWGRP} ${WWWDIR}" >> ${TMPPLIST}
>+	@${ECHO_CMD} "@postexec chmod -R =t,u=rwX,g=rX,o= ${WWWDIR}" >> ${TMPPLIST}
>+	@${ECHO_CMD} "@postexec chmod -R u=rwX,g=rwX,o= ${WWWDIR}/data" >> ${TMPPLIST}
>+.for __FILE in ${CONF_FILES}
>+	@${ECHO_CMD} "@postexec chmod 0660 ${WWWDIR}/conf/${__FILE}" >> ${TMPPLIST}
>+.endfor
>+
>+.include <bsd.port.mk>
>diff --git a/www/dokuwiki-devel/distinfo b/www/dokuwiki-devel/distinfo
>new file mode 100644
>index 000000000000..94d62a299b57
>--- /dev/null
>+++ b/www/dokuwiki-devel/distinfo
>@@ -0,0 +1,21 @@
>+TIMESTAMP = 1643419731
>+SHA256 (splitbrain-dokuwiki-20220127-4ef5d38db53e045a81f129b29a8b886cecc38497_GH0.tar.gz) = fe72a2bb717a6f07fdf1679df8b21e2982415cfdb3fca738a1c8adbb97372a42
>+SIZE (splitbrain-dokuwiki-20220127-4ef5d38db53e045a81f129b29a8b886cecc38497_GH0.tar.gz) = 3874356
>+SHA256 (xif-fr-dokuwiki-plugin-catlist-065f8d2f4817409989b9342b901163452fb9f547_GH0.tar.gz) = 6163e7b05391cae0f3cfdf9e2fe20dbc2ac19e42dc70b91b29e1271cc8f490ab
>+SIZE (xif-fr-dokuwiki-plugin-catlist-065f8d2f4817409989b9342b901163452fb9f547_GH0.tar.gz) = 11566
>+SHA256 (cosmocode-dokuwiki-plugin-cleanup-dc8184bc282ab1ef78586026d5dced37c5705eb6_GH0.tar.gz) = a0a88a07253b2a0ffe9ed95124832031551445271aad7a8319e708cd60e652d4
>+SIZE (cosmocode-dokuwiki-plugin-cleanup-dc8184bc282ab1ef78586026d5dced37c5705eb6_GH0.tar.gz) = 10559
>+SHA256 (ConX-dokuwiki-plugin-custombuttons-fe62df3de7f643225d6767b481f478e901f35a40_GH0.tar.gz) = 320562458a67b96f42d2e86702b5cbf4a6c1fd0f79338591a8756d543290db28
>+SIZE (ConX-dokuwiki-plugin-custombuttons-fe62df3de7f643225d6767b481f478e901f35a40_GH0.tar.gz) = 365913
>+SHA256 (cosmocode-edittable-3e7b1bdcbf8a188f6f2f3b97232f3ccbed899645_GH0.tar.gz) = c03f1d233b3c6b356fa10844780390c2d5f421dbe290da5a34f9bd67648efc94
>+SIZE (cosmocode-edittable-3e7b1bdcbf8a188f6f2f3b97232f3ccbed899645_GH0.tar.gz) = 339636
>+SHA256 (michitux-dokuwiki-plugin-move-f2416147498d9b33e36445820b54e015f1968776_GH0.tar.gz) = 26906823bc056dda92712b33a7df8183188d29f3ea90691e553b3a699c1b43ec
>+SIZE (michitux-dokuwiki-plugin-move-f2416147498d9b33e36445820b54e015f1968776_GH0.tar.gz) = 86121
>+SHA256 (splitbrain-dokuwiki-plugin-searchindex-32e56a59996ea3a10b3a70f0239fc13d58f1174b_GH0.tar.gz) = 7a2d33dbe1bf7c1ab9eaf722a92bc0996a261fe72fa16e9b0a4ce828b8ce1d40
>+SIZE (splitbrain-dokuwiki-plugin-searchindex-32e56a59996ea3a10b3a70f0239fc13d58f1174b_GH0.tar.gz) = 13313
>+SHA256 (dokufreaks-plugin-tag-43e7b584f35e6242758fdf42b45e96571abb1ef1_GH0.tar.gz) = 74920e3fe7a570ca9abaa36e6fadb06624553584edcd5ef95879a6d3956bc81b
>+SIZE (dokufreaks-plugin-tag-43e7b584f35e6242758fdf42b45e96571abb1ef1_GH0.tar.gz) = 43405
>+SHA256 (splitbrain-dokuwiki-plugin-translation-c3bb052a4dbd63809835e68809b904fafb5e613e_GH0.tar.gz) = e9fd9aac29348942c07a64262f58ec340d1a52d4f4965dd0e01894caabaa9859
>+SIZE (splitbrain-dokuwiki-plugin-translation-c3bb052a4dbd63809835e68809b904fafb5e613e_GH0.tar.gz) = 132342
>+SHA256 (splitbrain-dokuwiki-plugin-upgrade-dd8327d13a27f455530fc12f7b0cfaeca0b415b3_GH0.tar.gz) = 28ead579c33ba6fb51932b4b6502a42e82c77c8192f923f30cb13f7dc5327342
>+SIZE (splitbrain-dokuwiki-plugin-upgrade-dd8327d13a27f455530fc12f7b0cfaeca0b415b3_GH0.tar.gz) = 60653
>diff --git a/www/dokuwiki-devel/files/patch-wrong-2388-fix b/www/dokuwiki-devel/files/patch-wrong-2388-fix
>new file mode 100644
>index 000000000000..248527ef5852
>--- /dev/null
>+++ b/www/dokuwiki-devel/files/patch-wrong-2388-fix
>@@ -0,0 +1,11 @@
>+--- inc/httputils.php.orig	2018-04-22 11:17:57 UTC
>++++ inc/httputils.php
>+@@ -82,8 +82,6 @@ function http_sendfile($file) {
>+         ob_end_clean();
>+         exit;
>+     }elseif($conf['xsendfile'] == 3){
>+-        // FS#2388 nginx just needs the relative path.
>+-        $file = DOKU_REL.substr($file, strlen(fullpath(DOKU_INC)) + 1);
>+         header("X-Accel-Redirect: $file");
>+         ob_end_clean();
>+         exit;
>diff --git a/www/dokuwiki-devel/files/pkg-message.in b/www/dokuwiki-devel/files/pkg-message.in
>new file mode 100644
>index 000000000000..359633452dfb
>--- /dev/null
>+++ b/www/dokuwiki-devel/files/pkg-message.in
>@@ -0,0 +1,25 @@
>+[
>+{ type: install
>+  message: <<EOM
>+The wiki program have been installed to %%WWWDIR%%.
>+
>+Please configure your web server to allow running PHP scripts there.
>+
>+Please create dedicated data directory outside the installation directory
>+and make it owned by the process running these PHP scripts.  It is important
>+to make sure that your PHP intepreter does not allow running PHP scripts
>+there.
>+
>+For first install, you may have to manually copy the contents from
>+%%WWWDIR%%/data into the newly created data directory and change
>+the owner of %%WWWDIR%%/conf to the web server.
>+
>+Please go to http://www.your.host/dokuwiki/install.php to finish the
>+installation.  For FULL configuration instructions, see
>+http://wiki.splitbrain.org/wiki:config
>+
>+After installation please change the permissions of
>+%%WWWDIR%%/conf back to root:wheel.
>+EOM
>+}
>+]
>diff --git a/www/dokuwiki-devel/pkg-descr b/www/dokuwiki-devel/pkg-descr
>new file mode 100644
>index 000000000000..ab1860d6ddba
>--- /dev/null
>+++ b/www/dokuwiki-devel/pkg-descr
>@@ -0,0 +1,8 @@
>+DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
>+creating documentation of any kind. It is targeted at developer teams,
>+workgroups and small companies. It has a simple but powerful syntax which
>+makes sure the datafiles remain readable outside the Wiki and eases the
>+creation of structured texts.
>+All data is stored in plain text files - no database is required.
>+
>+WWW: https://www.dokuwiki.org/

Actions: View | Diff

Attachments on bug 261542: 231418 | 231437