diff --git a/.gitignore b/.gitignore index 7c47631..d20a993 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/mediawiki-1.38.4.tar.gz -/mediawiki-1.38.4.tar.gz.sig +/mediawiki-*.tar.gz +/mediawiki-*.tar.gz.sig diff --git a/README.RPM b/README.RPM index fe898a4..6326463 100644 --- a/README.RPM +++ b/README.RPM @@ -14,6 +14,10 @@ serving mediawiki) like DocumentRoot /srv/my.host/wiki Alias /skins /usr/share/mediawiki/skins + + AllowOverride None + Require all granted + SetEnv MW_INSTALL_PATH "/srv/my.host/wiki" diff --git a/mediawiki.conf b/mediawiki.conf index 4398fa6..8d4f63b 100644 --- a/mediawiki.conf +++ b/mediawiki.conf @@ -4,6 +4,10 @@ # instance or create copies of it. # Alias /wiki/skins /usr/share/mediawiki/skins +# +# AllowOverride None +# Require all granted +# # Alias /wiki /var/www/wiki # # SetEnv MW_INSTALL_PATH "/var/www/wiki" @@ -14,3 +18,7 @@ # If your DocumentRoot points into the wiki itself all that is needed is # Alias /skins /usr/share/mediawiki/skins +# +# AllowOverride None +# Require all granted +# diff --git a/mediawiki.spec b/mediawiki.spec index 26ca502..5c55635 100644 --- a/mediawiki.spec +++ b/mediawiki.spec @@ -1,11 +1,11 @@ Summary: A wiki engine Name: mediawiki -Version: 1.38.4 -Release: 1%{?dist} -License: GPLv2+ +Version: 1.44.3 +Release: 2%{?dist} +License: GPL-2.0-or-later URL: https://www.mediawiki.org/ -Source0: https://download.wikimedia.org/mediawiki/1.38/%{name}-%{version}.tar.gz -Source1: https://download.wikimedia.org/mediawiki/1.38/%{name}-%{version}.tar.gz.sig +Source0: https://releases.wikimedia.org/mediawiki/1.44/%{name}-%{version}.tar.gz +Source1: https://releases.wikimedia.org/mediawiki/1.44/%{name}-%{version}.tar.gz.sig Source2: mediawiki.conf Source3: README.RPM Source4: mw-createinstance.in @@ -21,105 +21,106 @@ BuildRequires: php-intl BuildRequires: php-pdo #BuildRequires: php-phpunit-PHPUnit BuildRequires: php-theseer-autoload -BuildRequires: php-composer(cssjanus/cssjanus) >= 2.1.0 -#BuildRequires: php-composer(leafo/lessphp) >= 0.5.0 BuildRequires: php-composer(liuggio/statsd-php-client) >= 1.0.18 -BuildRequires: php-composer(oojs/oojs-ui) >= 0.43.2 +BuildRequires: php-composer(oojs/oojs-ui) >= 0.51.2 BuildRequires: php-composer(psr/log) >= 1.1.4 BuildRequires: php-composer(wikimedia/assert) >= 0.5.1 -BuildRequires: php-composer(wikimedia/avro) >= 1.9.0 -BuildRequires: php-composer(wikimedia/cdb) >= 2.0.0 -BuildRequires: php-composer(wikimedia/ip-set) >= 3.0.0 -BuildRequires: php-composer(wikimedia/utfnormal) >= 3.0.2 +BuildRequires: php-composer(wikimedia/cdb) >= 3.0.0 +BuildRequires: php-composer(wikimedia/utfnormal) >= 4.0.0 BuildRequires: php-composer(zordius/lightncandy) >= 1.2.6 -BuildRequires: php-pear(Mail) >= 1.4.1 -BuildRequires: php-pear(Mail_Mime) >= 1.10.11 -BuildRequires: php-pear(Mail_mimeDecode) >= 1.5.5 -BuildRequires: php-pear(Net_SMTP) >= 1.9.2 +BuildRequires: php-pear(Mail) >= 2.0.0 +BuildRequires: php-pear(Mail_Mime) >= 1.10.12 +BuildRequires: php-pear(Net_SMTP) >= 1.12.1 BuildRequires: php-pear(Net_Socket) >= 1.2.2 BuildRequires: python3-devel Requires: httpd-filesystem Requires: php(httpd) -Requires: php(language) >= 7.3.19 +Requires: php(language) >= 8.1.0 Requires: php-gd Requires: php-xml -Requires: diffutils, ImageMagick -Requires: php-composer(cssjanus/cssjanus) >= 2.1.0 -#Requires: php-composer(leafo/lessphp) >= 0.5.0 +Requires: diffutils +Recommends: ImageMagick Requires: php-composer(liuggio/statsd-php-client) >= 1.0.18 -Requires: php-composer(oojs/oojs-ui) >= 0.43.2 +Requires: php-composer(oojs/oojs-ui) >= 0.51.2 Requires: php-composer(psr/log) >= 1.1.4 Requires: php-composer(wikimedia/assert) >= 0.5.1 -Requires: php-composer(wikimedia/avro) >= 1.9.0 -Requires: php-composer(wikimedia/cdb) >= 2.0.0 -Requires: php-composer(wikimedia/ip-set) >= 3.0.0 -Requires: php-composer(wikimedia/utfnormal) >= 3.0.2 +Requires: php-composer(wikimedia/cdb) >= 3.0.0 +Requires: php-composer(wikimedia/utfnormal) >= 4.0.0 Requires: php-composer(zordius/lightncandy) >= 1.2.6 -Requires: php-pear(Mail) >= 1.4.1 -Requires: php-pear(Mail_Mime) >= 1.10.11 -Requires: php-pear(Mail_mimeDecode) >= 1.5.5 -Requires: php-pear(Net_SMTP) >= 1.10.0 +Requires: php-pear(Mail) >= 2.0.0 +Requires: php-pear(Mail_Mime) >= 1.10.12 +Requires: php-pear(Net_SMTP) >= 1.12.1 Requires: php-pear(Net_Socket) >= 1.2.2 # Update script call command-line php Requires(post): php-cli Obsoletes: php-mediawiki-at-ease <= 1.1.0 +Obsoletes: php-wikimedia-ip-set <= 3.1.0 +Obsoletes: php-wikimedia-avro <= 1.9.0 +Provides: bundled(php-bacon-bacon-qr-code) = 3.0.1 Provides: bundled(php-christian-riesen-base32) = 1.6.0 -Provides: bundled(php-composer-semver) = 3.2.6 -Provides: bundled(php-guzzlehttp-guzzle) = 7.4.5 -Provides: bundled(php-guzzlehttp-promises) = 1.5.1 -Provides: bundled(php-guzzlehttp-psr7) = 2.4.0 +Provides: bundled(php-composer-semver) = 3.4.3 +Provides: bundled(php-dasprid-enum) = 1.0.6 +Provides: bundled(php-endroid-qr-code) = 5.1.0 +Provides: bundled(php-firebase-php-jwt) = 6.10.0 +Provides: bundled(php-guzzlehttp-guzzle) = 7.9.3 +Provides: bundled(php-guzzlehttp-promises) = 2.0.4 +Provides: bundled(php-guzzlehttp-psr7) = 2.7.0 Provides: bundled(php-jakobo-hotp-php) = 2.0.0 -Provides: bundled(php-opis-json-schema) = 1.1.0 -Provides: bundled(php-monolog-monolog) = 2.2.0 +Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 +Provides: bundled(php-mck89-peast) = 1.17.0 +Provides: bundled(php-monolog-monolog) = 2.9.3 Provides: bundled(php-pear-console_getopt) = 1.4.3 -Provides: bundled(php-pear-Net_URL2) = 2.2.2 -Provides: bundled(php-pear-pear-core-minimal) = 1.10.11 +Provides: bundled(php-pear-Net_URL2) = 2.2.3 +Provides: bundled(php-pear-pear-core-minimal) = 1.10.16 Provides: bundled(php-pear-pear_exception) = 1.0.2 -Provides: bundled(php-psr-container) = 1.1.1 -Provides: bundled(php-psr-http-client) = 1.0.1 -Provides: bundled(php-psr-http-factory) = 1.0.1 -Provides: bundled(php-psr-http-message) = 1.0.1 -Provides: bundled(php-psr-simple-cache) = 1.0.1 +Provides: bundled(php-psr-container) = 1.1.2 +Provides: bundled(php-psr-http-client) = 1.0.3 +Provides: bundled(php-psr-http-factory) = 1.1.0 +Provides: bundled(php-psr-http-message) = 1.1 Provides: bundled(php-ralouphie-getallheaders) = 3.0.3 -Provides: bundled(php-symfony-deprecation-contracts) = 2.5.1 -Provides: bundled(php-symfony-polyfill-php80) = 1.25.0 -Provides: bundled(php-symfony-polyfill-php81) = 1.25.0 -Provides: bundled(php-symfony-yaml) = 5.4.3 -Provides: bundled(php-wikimedia-at-ease) = 2.1.0 -Provides: bundled(php-wikimedia-common-passwords) = 0.4.0 -Provides: bundled(php-wikimedia-composer-merge-plugin) = 2.0.1 -Provides: bundled(php-wikimedia-css-sanitizer) = 3.0.2 -Provides: bundled(php-wikimedia-equivset) = 1.4.3 -Provides: bundled(php-wikimedia-remex-html) = 3.0.2 -Provides: bundled(php-wikimedia-timestamp) = 3.0.0 -Provides: bundled(php-wikimedia-base-convert) = 2.0.1 -Provides: bundled(php-wikimedia-cldr-plural-rule-parser) = 2.0.0 -Provides: bundled(php-wikimedia-composer-merge-plugin) = 2.0.1 -Provides: bundled(php-wikimedia-html-formatter) = 3.0.1 -Provides: bundled(php-wikimedia-ip-utils) = 4.0.0 -Provides: bundled(php-wikimedia-less.php) = 3.1.0 -Provides: bundled(php-wikimedia-minify) = 2.2.6 -Provides: bundled(php-wikimedia-normalized-exception) = 1.0.1 -Provides: bundled(php-wikimedia-object-factory) = 4.0.0 -Provides: bundled(php-wikimedia-parsoid) = 0.15.1 -Provides: bundled(php-wikimedia-php-session-serializer) = 2.0.0 -Provides: bundled(php-wikimedia-purtle) = 1.0.8 -Provides: bundled(php-wikimedia-relpath) = 3.0.0 -Provides: bundled(php-wikimedia-remex-html) = 3.0.2 -Provides: bundled(php-wikimedia-request-timeout) = 1.2.0 -Provides: bundled(php-wikimedia-running-stat) = 1.2.1 -Provides: bundled(php-wikimedia-scoped-callback) = 3.0.0 -Provides: bundled(php-wikimedia-services) = 2.0.1 -Provides: bundled(php-wikimedia-shellbox) = 3.0.0 -Provides: bundled(php-wikimedia-timestamp) = 3.0.0 +Provides: bundled(php-symfony-deprecation-contracts) = 2.5.4 +Provides: bundled(php-symfony-polyfill-php82) = 1.32.0 +Provides: bundled(php-symfony-polyfill-php83) = 1.32.0 +Provides: bundled(php-symfony-polyfill-php84) = 1.32.0 +Provides: bundled(php-symfony-polyfill-php85) = 1.33.0 +Provides: bundled(php-symfony-yaml) = 5.4.45 +Provides: bundled(php-wikimedia-at-ease) = 3.0.0 +Provides: bundled(php-wikimedia-common-passwords) = 0.5.1 +Provides: bundled(php-wikimedia-composer-merge-plugin) = 2.1.0 +Provides: bundled(php-wikimedia-equivset) = 1.7.1 +Provides: bundled(php-wikimedia-base-convert) = 2.0.2 +Provides: bundled(php-wikimedia-bcp-47-code) = 2.0.1 +Provides: bundled(php-wikimedia-cldr-plural-rule-parser) = 3.0.0 +Provides: bundled(php-wikimedia-composer-merge-plugin) = 2.1.0 +Provides: bundled(php-wikimedia-css-sanitizer) = 5.5.0 +Provides: bundled(php-wikimedia-cssjanus) = 2.3.0 +Provides: bundled(php-wikimedia-html-formatter) = 4.1.0 +Provides: bundled(php-wikimedia-ip-utils) = 5.0.0 +Provides: bundled(php-wikimedia-json-codec) = 3.0.3 +Provides: bundled(php-wikimedia-langconv) = 0.4.2 +Provides: bundled(php-wikimedia-less.php) = 5.1.2 +Provides: bundled(php-wikimedia-minify) = 2.9.0 +Provides: bundled(php-wikimedia-normalized-exception) = 2.1.1 +Provides: bundled(php-wikimedia-object-factory) = 5.0.1 +Provides: bundled(php-wikimedia-parsoid) = 0.21.1 +Provides: bundled(php-wikimedia-php-session-serializer) = 3.0.1 +Provides: bundled(php-wikimedia-purtle) = 2.0.0 +Provides: bundled(php-wikimedia-relpath) = 4.0.2 +Provides: bundled(php-wikimedia-remex-html) = 4.1.2 +Provides: bundled(php-wikimedia-request-timeout) = 2.0.2 +Provides: bundled(php-wikimedia-running-stat) = 2.1.0 +Provides: bundled(php-wikimedia-scoped-callback) = 5.0.0 +Provides: bundled(php-wikimedia-services) = 4.0.0 +Provides: bundled(php-wikimedia-shellbox) = 4.2.0 +Provides: bundled(php-wikimedia-timestamp) = 4.2.0 Provides: bundled(php-wikimedia-wait-condition-loop) = 2.0.2 Provides: bundled(php-wikimedia-wrappedstring) = 4.0.1 -Provides: bundled(php-wikimedia-xmp-reader) = 0.8.1 -Provides: bundled(php-wikimedia-zest-css) = 2.0.2 +Provides: bundled(php-wikimedia-xmp-reader) = 0.10.2 +Provides: bundled(php-wikimedia-zest-css) = 3.0.2 %description @@ -134,14 +135,13 @@ Remember to remove the config dir after completing the configuration. %prep -%setup -q +%autosetup # Remove extension as it ships a bundled lua binary rm -rf extensions/Scribunto # Remove bundled PHP libraries in order to use system versions rm -rf vendor/composer/*php rm -rf vendor/composer/*json rm -rf vendor/composer/LICENSE -rm -rf vendor/cssjanus rm -rf vendor/liuggio rm -rf vendor/oojs #rm -rf vendor/oyejorge @@ -156,7 +156,6 @@ rm -rf vendor/wikimedia/composer-merge-plugin rm -rf vendor/wikimedia/ip-set rm -rf vendor/wikimedia/utfnormal rm -rf vendor/zordius -ln -s %{_datadir}/php/cssjanus vendor/cssjanus-shared ln -s %{_datadir}/php/Liuggio vendor/liuggio-shared ln -s %{_datadir}/php/OOUI vendor/oojs-shared #ln -s %%{_datadir}/php/lessphp vendor/oyejorge-shared @@ -175,13 +174,13 @@ ln -s %{_datadir}/php/zordius vendor/zordius-shared extensions/SyntaxHighlight_GeSHi/pygments/create_pygmentize_bundle %build -phpab --follow --tolerant --output vendor/autoload.php vendor -echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/at-ease/src/Wikimedia/Functions.php';" >> vendor/autoload.php +%{_bindir}/php -d memory_limit=1G %{_bindir}/phpab --follow --tolerant --output vendor/autoload.php vendor +echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/at-ease/src/AtEase.php';" >> vendor/autoload.php echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/base-convert/src/Functions.php';" >> vendor/autoload.php echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/html-formatter/src/HtmlFormatter.php';" >> vendor/autoload.php -echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/php-session-serializer/src/Wikimedia/PhpSessionSerializer.php';" >> vendor/autoload.php +echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/php-session-serializer/src/PhpSessionSerializer.php';" >> vendor/autoload.php echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/timestamp/src/defines.php';" >> vendor/autoload.php -echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/relpath/src/Wikimedia/RelPath.php';" >> vendor/autoload.php +echo "require dirname(dirname(__FILE__)) . '/vendor/wikimedia/relpath/src/RelPath.php';" >> vendor/autoload.php %install @@ -251,7 +250,7 @@ cd tests/phpunit %files -%doc FAQ HISTORY README.md README.RPM RELEASE-NOTES-1.38 UPGRADE CREDITS docs +%doc FAQ HISTORY README.md README.RPM RELEASE-NOTES-1.44 UPGRADE CREDITS docs %license COPYING %{_datadir}/mediawiki /var/www/wiki @@ -263,6 +262,60 @@ cd tests/phpunit %changelog +* Thu Dec 11 2025 Michael Cronenworth - 1.44.3-2 +- Fix typo in Provides + +* Wed Dec 10 2025 Michael Cronenworth - 1.44.3-1 +- Update to 1.44.3 + +* Thu Jul 24 2025 Fedora Release Engineering - 1.43.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jun 12 2025 Michael Cronenworth - 1.43.1-1 +- Update to 1.43.1 + +* Thu Jan 16 2025 Michael Cronenworth - 1.43.0-1 +- Update to 1.43.0 + +* Mon Dec 09 2024 Orion Poplawski - 1.41.1-3 +- Use run.php for maintenance scripts (rhbz#2330978) + +* Thu Jul 18 2024 Fedora Release Engineering - 1.41.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 03 2024 Michael Cronenworth - 1.41.1-1 +- Update to 1.41.1 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.40.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.40.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Aug 23 2023 Michael Cronenworth - 1.40.0-1 +- Update to 1.40.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.39.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Apr 01 2023 Michael Cronenworth - 1.39.3-1 +- Update to 1.39.3 + +* Sun Feb 26 2023 Michael Cronenworth - 1.39.2-1 +- Update to 1.39.2 +- https://www.mediawiki.org/wiki/Release_notes/1.39#MediaWiki_1.39.2 +- Change ImageMagick to a weak dependency + +* Sun Feb 26 2023 Orion Poplawski - 1.39.1-3 +- Add tags for skins in apache httpd config (bz#2171908) + +* Thu Jan 19 2023 Fedora Release Engineering - 1.39.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 10 2023 Michael Cronenworth - 1.39.1-1 +- Update to 1.39.1 +- https://www.mediawiki.org/wiki/Release_notes/1.39#MediaWiki_1.39.1 + * Tue Nov 01 2022 Michael Cronenworth - 1.38.4-1 - Update to 1.38.4 diff --git a/mw-updateallinstances.in b/mw-updateallinstances.in index b927354..a20781b 100644 --- a/mw-updateallinstances.in +++ b/mw-updateallinstances.in @@ -5,6 +5,6 @@ cat @sysconfdir@/mediawiki/instances | while read path; do mw-createinstance "$path" if test -e "$path"/LocalSettings.php; then cd "$path" - php @datadir@/mediawiki/maintenance/update.php --quick --conf LocalSettings.php + php @datadir@/mediawiki/maintenance/run.php update --quick --conf LocalSettings.php fi done diff --git a/sources b/sources index 88e3d83..83ac4b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mediawiki-1.38.4.tar.gz) = feb1b4a8eacf0ec1377681482e244527a4185af583776ea5ce2cfb27e0cf119ae8d66fab4bc24c34bf82df74cf13f10a9b9c488f2ed9f8be24e5c992588d9fcf -SHA512 (mediawiki-1.38.4.tar.gz.sig) = ce8955b209b790898d105187e858f1480527e49e2ca06041e85e68674a72a93e1b42abc2d2f3195b148d02532b3b6399f10d5b9b627338f5ec8e18df210a1a04 +SHA512 (mediawiki-1.44.3.tar.gz) = 1ad3a5cfbb436a4c32b4e3c44bbf1a9e503b4cd2c541029eca201c42d564150b8b3d7ada506525e73de4e05526a0f47a5e2aabc4b416d43d02d6dad3e808f8a3 +SHA512 (mediawiki-1.44.3.tar.gz.sig) = aa42313f9cd03777b56b47e71be8801bd398544fa12e26d713b209e9b757763e241bfc72da795e2c62a5640e93d02ff0c9fe424a6609d73fbd1e17c757891816