Attachment 241464 Details for Bug 270826 – www/dokuwiki patch

[patch] www/dokuwiki patch

dokuwiki-2023-04-04.patch (text/plain), 13.05 KB, created by Mike Fisher on 2023-04-13 22:14:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Fisher

Created: 2023-04-13 22:14:41 UTC

Size: 13.05 KB

patch

obsolete

>diff -ur /home/mfisher/github-freebsd-ports/www/dokuwiki/Makefile ./Makefile
>--- /home/mfisher/github-freebsd-ports/www/dokuwiki/Makefile	2023-04-13 09:11:03.608269000 -0400
>+++ ./Makefile	2023-04-13 18:03:47.275984000 -0400
>@@ -1,6 +1,5 @@
> PORTNAME=	dokuwiki
> PORTVERSION=	${DIST_VER:S/${PORTNAME}//:S/-//g}
>-PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://download.dokuwiki.org/src/dokuwiki/
> PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
>@@ -18,11 +17,17 @@
> LICENSE_FILE_GPLv3=		${WRKSRC}/vendor/marcusschwarz/lesserphp/LICENSE
> LICENSE_FILE_MIT=		${WRKSRC}/vendor/composer/LICENSE
> 
>-DIST_VER=	${PORTNAME}-2022-07-31a
>+DIST_VER=	${PORTNAME}-2023-04-04
> USES=		cpe php:web,flavors shebangfix tar:tgz
> USE_PHP=	filter gd hash json mbstring openssl pcre session xml zlib
> NO_ARCH=	YES
> NO_BUILD=	YES
>+
>+OPTIONS_DEFINE=	LDAP SIMPLEXML
>+LDAP_DESC=	Require LDAP modules (for authentication)
>+LDAP_USE=	php=ldap
>+SIMPLEXML_DESC= Require SimpleXML module
>+SIMPLEXML_USE=	php=simplexml
> 
> SHEBANG_FILES=	bin/*.php
> SUB_FILES=	pkg-message
>diff -ur /home/mfisher4/github-freebsd-ports/www/dokuwiki/distinfo ./distinfo
>--- /home/mfisher4/github-freebsd-ports/www/dokuwiki/distinfo	2023-04-13 09:11:03.627412000 -0400
>+++ ./distinfo	2023-04-13 09:59:51.948608000 -0400
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1662227184
>-SHA256 (dokuwiki-2022-07-31a.tgz) = 48ed2ae11fa4a0ae8338af9aedc837601b34e21c0be15d16e2d6228ca7a91f23
>-SIZE (dokuwiki-2022-07-31a.tgz) = 3985949
>+TIMESTAMP = 1681394391
>+SHA256 (dokuwiki-2023-04-04.tgz) = 3e3f97b47a24332ee59ea52286587ab9c342792b91f3eec18c3bf14957117b46
>+SIZE (dokuwiki-2023-04-04.tgz) = 4032792
>diff -ur /home/mfisher4/github-freebsd-ports/www/dokuwiki/pkg-plist ./pkg-plist
>--- /home/mfisher4/github-freebsd-ports/www/dokuwiki/pkg-plist	2023-04-13 09:11:03.642871000 -0400
>+++ ./pkg-plist	2023-04-13 18:09:56.828187000 -0400
>@@ -11,8 +11,6 @@
> %%WWWDIR%%/bin/render.php
> %%WWWDIR%%/bin/striplangs.php
> %%WWWDIR%%/bin/wantedpages.php
>-%%WWWDIR%%/composer.json
>-%%WWWDIR%%/composer.lock
> %%WWWDIR%%/conf/.htaccess
> %%WWWDIR%%/conf/acl.auth.php.dist
> %%WWWDIR%%/conf/acronyms.conf
>@@ -155,6 +153,7 @@
> %%WWWDIR%%/inc/HTTP/HTTPClient.php
> %%WWWDIR%%/inc/HTTP/HTTPClientException.php
> %%WWWDIR%%/inc/HTTP/Headers.php
>+%%WWWDIR%%/inc/Info.php
> %%WWWDIR%%/inc/Input/Get.php
> %%WWWDIR%%/inc/Input/Input.php
> %%WWWDIR%%/inc/Input/Post.php
>@@ -217,7 +216,6 @@
> %%WWWDIR%%/inc/Parsing/ParserMode/Formatting.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Header.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Hr.php
>-%%WWWDIR%%/inc/Parsing/ParserMode/Html.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Internallink.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Linebreak.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Listblock.php
>@@ -226,7 +224,6 @@
> %%WWWDIR%%/inc/Parsing/ParserMode/Multiplyentity.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Nocache.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Notoc.php
>-%%WWWDIR%%/inc/Parsing/ParserMode/Php.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Plugin.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Preformatted.php
> %%WWWDIR%%/inc/Parsing/ParserMode/Quote.php
>@@ -310,6 +307,7 @@
> %%WWWDIR%%/inc/fulltext.php
> %%WWWDIR%%/inc/html.php
> %%WWWDIR%%/inc/httputils.php
>+%%WWWDIR%%/inc/httputils.php.orig
> %%WWWDIR%%/inc/indexer.php
> %%WWWDIR%%/inc/infoutils.php
> %%WWWDIR%%/inc/init.php
>@@ -1318,6 +1316,7 @@
> %%WWWDIR%%/inc/lang/hy/edit.txt
> %%WWWDIR%%/inc/lang/hy/editrev.txt
> %%WWWDIR%%/inc/lang/hy/index.txt
>+%%WWWDIR%%/inc/lang/hy/jquery.ui.datepicker.js
> %%WWWDIR%%/inc/lang/hy/lang.php
> %%WWWDIR%%/inc/lang/ia/admin.txt
> %%WWWDIR%%/inc/lang/ia/adminplugins.txt
>@@ -3124,6 +3123,7 @@
> %%WWWDIR%%/lib/plugins/authldap/lang/el/settings.php
> %%WWWDIR%%/lib/plugins/authldap/lang/en/lang.php
> %%WWWDIR%%/lib/plugins/authldap/lang/en/settings.php
>+%%WWWDIR%%/lib/plugins/authldap/lang/eo/lang.php
> %%WWWDIR%%/lib/plugins/authldap/lang/eo/settings.php
> %%WWWDIR%%/lib/plugins/authldap/lang/es/lang.php
> %%WWWDIR%%/lib/plugins/authldap/lang/es/settings.php
>@@ -3210,6 +3210,8 @@
> %%WWWDIR%%/lib/plugins/authpdo/lang/el/settings.php
> %%WWWDIR%%/lib/plugins/authpdo/lang/en/lang.php
> %%WWWDIR%%/lib/plugins/authpdo/lang/en/settings.php
>+%%WWWDIR%%/lib/plugins/authpdo/lang/eo/lang.php
>+%%WWWDIR%%/lib/plugins/authpdo/lang/eo/settings.php
> %%WWWDIR%%/lib/plugins/authpdo/lang/es/lang.php
> %%WWWDIR%%/lib/plugins/authpdo/lang/es/settings.php
> %%WWWDIR%%/lib/plugins/authpdo/lang/fa/lang.php
>@@ -3668,9 +3670,33 @@
> %%WWWDIR%%/lib/plugins/info/syntax.php
> %%WWWDIR%%/lib/plugins/logviewer/admin.php
> %%WWWDIR%%/lib/plugins/logviewer/admin.svg
>+%%WWWDIR%%/lib/plugins/logviewer/lang/de/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/de/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/de/nolog.txt
> %%WWWDIR%%/lib/plugins/logviewer/lang/en/intro.txt
> %%WWWDIR%%/lib/plugins/logviewer/lang/en/lang.php
> %%WWWDIR%%/lib/plugins/logviewer/lang/en/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/es/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/es/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/es/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/fr/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/fr/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/fr/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/it/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt-br/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt-br/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt-br/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/pt/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/ru/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/ru/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/vi/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/vi/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/vi/nolog.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/zh/intro.txt
>+%%WWWDIR%%/lib/plugins/logviewer/lang/zh/lang.php
>+%%WWWDIR%%/lib/plugins/logviewer/lang/zh/nolog.txt
> %%WWWDIR%%/lib/plugins/logviewer/plugin.info.txt
> %%WWWDIR%%/lib/plugins/logviewer/script.js
> %%WWWDIR%%/lib/plugins/logviewer/style.less
>@@ -3989,13 +4015,6 @@
> %%WWWDIR%%/lib/plugins/styling/script.js
> %%WWWDIR%%/lib/plugins/styling/style.less
> %%WWWDIR%%/lib/plugins/syntax.php
>-%%WWWDIR%%/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php
>-%%WWWDIR%%/lib/plugins/testing/_test/dummy_plugin_test.test.php
>-%%WWWDIR%%/lib/plugins/testing/action.php
>-%%WWWDIR%%/lib/plugins/testing/conf/default.php
>-%%WWWDIR%%/lib/plugins/testing/conf/metadata.php
>-%%WWWDIR%%/lib/plugins/testing/lang/en/settings.php
>-%%WWWDIR%%/lib/plugins/testing/plugin.info.txt
> %%WWWDIR%%/lib/plugins/usermanager/_test/csv_export.test.php
> %%WWWDIR%%/lib/plugins/usermanager/_test/csv_import.test.php
> %%WWWDIR%%/lib/plugins/usermanager/_test/mocks.class.php
>@@ -4513,6 +4532,7 @@
> %%WWWDIR%%/vendor/.htaccess
> %%WWWDIR%%/vendor/README
> %%WWWDIR%%/vendor/autoload.php
>+%%WWWDIR%%/vendor/aziraphale/email-address-validator/.gitignore
> %%WWWDIR%%/vendor/aziraphale/email-address-validator/EmailAddressValidator.php
> %%WWWDIR%%/vendor/aziraphale/email-address-validator/README.md
> %%WWWDIR%%/vendor/aziraphale/email-address-validator/composer.json
>@@ -4529,6 +4549,7 @@
> %%WWWDIR%%/vendor/composer/installed.php
> %%WWWDIR%%/vendor/composer/platform_check.php
> %%WWWDIR%%/vendor/geshi/geshi/.editorconfig
>+%%WWWDIR%%/vendor/geshi/geshi/.gitignore
> %%WWWDIR%%/vendor/geshi/geshi/BUGS
> %%WWWDIR%%/vendor/geshi/geshi/CHANGELOG
> %%WWWDIR%%/vendor/geshi/geshi/LICENSE
>@@ -4798,6 +4819,7 @@
> %%WWWDIR%%/vendor/geshi/geshi/src/geshi/z80.php
> %%WWWDIR%%/vendor/geshi/geshi/src/geshi/zxbasic.php
> %%WWWDIR%%/vendor/kissifrot/php-ixr/.editorconfig
>+%%WWWDIR%%/vendor/kissifrot/php-ixr/.gitignore
> %%WWWDIR%%/vendor/kissifrot/php-ixr/LICENSE.txt
> %%WWWDIR%%/vendor/kissifrot/php-ixr/README.md
> %%WWWDIR%%/vendor/kissifrot/php-ixr/composer.json
>@@ -4815,12 +4837,15 @@
> %%WWWDIR%%/vendor/kissifrot/php-ixr/src/Server/ClassServer.php
> %%WWWDIR%%/vendor/kissifrot/php-ixr/src/Server/IntrospectionServer.php
> %%WWWDIR%%/vendor/kissifrot/php-ixr/src/Server/Server.php
>+%%WWWDIR%%/vendor/marcusschwarz/lesserphp/.gitignore
> %%WWWDIR%%/vendor/marcusschwarz/lesserphp/HISTORY.md
> %%WWWDIR%%/vendor/marcusschwarz/lesserphp/LICENSE
> %%WWWDIR%%/vendor/marcusschwarz/lesserphp/README.md
> %%WWWDIR%%/vendor/marcusschwarz/lesserphp/composer.json
> %%WWWDIR%%/vendor/marcusschwarz/lesserphp/lessc.inc.php
> %%WWWDIR%%/vendor/openpsa/universalfeedcreator/.editorconfig
>+%%WWWDIR%%/vendor/openpsa/universalfeedcreator/.gitattributes
>+%%WWWDIR%%/vendor/openpsa/universalfeedcreator/.gitignore
> %%WWWDIR%%/vendor/openpsa/universalfeedcreator/LICENSE
> %%WWWDIR%%/vendor/openpsa/universalfeedcreator/README.md
> %%WWWDIR%%/vendor/openpsa/universalfeedcreator/composer.json
>@@ -4877,6 +4902,8 @@
> %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
> %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
> %%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf
>+%%WWWDIR%%/vendor/simplepie/simplepie/.editorconfig
>+%%WWWDIR%%/vendor/simplepie/simplepie/.php-cs-fixer.dist.php
> %%WWWDIR%%/vendor/simplepie/simplepie/CHANGELOG.md
> %%WWWDIR%%/vendor/simplepie/simplepie/LICENSE.txt
> %%WWWDIR%%/vendor/simplepie/simplepie/README.markdown
>@@ -4921,6 +4948,46 @@
> %%WWWDIR%%/vendor/simplepie/simplepie/library/SimplePie/Source.php
> %%WWWDIR%%/vendor/simplepie/simplepie/library/SimplePie/XML/Declaration/Parser.php
> %%WWWDIR%%/vendor/simplepie/simplepie/library/SimplePie/gzdecode.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Author.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/Base.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/BaseDataCache.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/CallableNameFilter.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/DB.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/DataCache.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/File.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/Memcache.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/Memcached.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/MySQL.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/NameFilter.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/Psr16.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Cache/Redis.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Caption.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Category.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Content/Type/Sniffer.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Copyright.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Credit.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Enclosure.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Exception.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/File.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Gzdecode.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/HTTP/Parser.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/IRI.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Item.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Locator.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Misc.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Net/IPv6.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Parse/Date.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Parser.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Rating.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Registry.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/RegistryAware.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Restriction.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Sanitize.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/SimplePie.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/Source.php
>+%%WWWDIR%%/vendor/simplepie/simplepie/src/XML/Declaration/Parser.php
>+%%WWWDIR%%/vendor/splitbrain/php-archive/.gitignore
> %%WWWDIR%%/vendor/splitbrain/php-archive/LICENSE
> %%WWWDIR%%/vendor/splitbrain/php-archive/README.md
> %%WWWDIR%%/vendor/splitbrain/php-archive/composer.json
>@@ -4933,15 +5000,26 @@
> %%WWWDIR%%/vendor/splitbrain/php-archive/src/FileInfoException.php
> %%WWWDIR%%/vendor/splitbrain/php-archive/src/Tar.php
> %%WWWDIR%%/vendor/splitbrain/php-archive/src/Zip.php
>+%%WWWDIR%%/vendor/splitbrain/php-cli/.gitignore
> %%WWWDIR%%/vendor/splitbrain/php-cli/LICENSE
> %%WWWDIR%%/vendor/splitbrain/php-cli/README.md
> %%WWWDIR%%/vendor/splitbrain/php-cli/composer.json
>+%%WWWDIR%%/vendor/splitbrain/php-cli/src/Base.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/CLI.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/Colors.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/Exception.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/Options.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/PSR3CLI.php
>+%%WWWDIR%%/vendor/splitbrain/php-cli/src/PSR3CLIv3.php
> %%WWWDIR%%/vendor/splitbrain/php-cli/src/TableFormatter.php
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/LICENSE
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/README.md
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/composer.json
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/composer.lock
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/src/Exception.php
>+%%WWWDIR%%/vendor/splitbrain/php-jsstrip/src/JSStrip.php
>+%%WWWDIR%%/vendor/splitbrain/slika/.gitattributes
>+%%WWWDIR%%/vendor/splitbrain/slika/.gitignore
> %%WWWDIR%%/vendor/splitbrain/slika/LICENSE
> %%WWWDIR%%/vendor/splitbrain/slika/README.md
> %%WWWDIR%%/vendor/splitbrain/slika/composer.json

Actions: View | Diff

Attachments on bug 270826: 241464