Re: [Wikitech-l] MediaWiki Security and Maintenance Releases: 1.19.19, 1.22.11 and 1.23.4
Adding the space to includes/XmlTypeCheck.php before applying the patch worked. Thank you! On 26 September 2014 19:23, Grunny wrote: > It's because there's a leading space before the tab in front of the comment > here: > https://git.wikimedia.org/blob/mediawiki%2Fcore.git/REL1_19/includes%2FXmlTypeCheck.php#L22 > > That leading space exists in the patch for 1.19.19, so applies fine when > you're applying it to a fresh copy of the 1.19.18 branch. But, as it was > introduced in the 1.19.10 release ( > https://git.wikimedia.org/commitdiff/mediawiki%2Fcore.git/926b9e6) and the > patch for the 1.19.10 release didn't include the space, if you used the > patches for all releases since, it won't be there and the new 1.19.19 patch > will fail to apply the first changes to that file without fixing that space > first. > > Cheers, > grunny > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] MediaWiki Security and Maintenance Releases: 1.19.19, 1.22.11 and 1.23.4
It's because there's a leading space before the tab in front of the comment here: https://git.wikimedia.org/blob/mediawiki%2Fcore.git/REL1_19/includes%2FXmlTypeCheck.php#L22 That leading space exists in the patch for 1.19.19, so applies fine when you're applying it to a fresh copy of the 1.19.18 branch. But, as it was introduced in the 1.19.10 release ( https://git.wikimedia.org/commitdiff/mediawiki%2Fcore.git/926b9e6) and the patch for the 1.19.10 release didn't include the space, if you used the patches for all releases since, it won't be there and the new 1.19.19 patch will fail to apply the first changes to that file without fixing that space first. Cheers, grunny ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] MediaWiki Security and Maintenance Releases: 1.19.19, 1.22.11 and 1.23.4
On 9/26/14, David Gerard wrote: > On 24 September 2014 23:28, Markus Glaser wrote: > >> Patch to previous version (1.19.18): >> https://releases.wikimedia.org/mediawiki/1.19/mediawiki-1.19.19.patch.gz > > > > So I downloaded and applied this. gunzipped it, got this: > > -rw-r--r-- 1 root root 13663 Sep 24 21:35 mediawiki-1.19.19.patch > > Applied it, and got this (on two different wikis): > > # patch -p1 --dry-run < mediawiki-1.19.19.patch > patching file includes/DefaultSettings.php > patching file includes/Sanitizer.php > patching file includes/upload/UploadBase.php > patching file includes/XmlTypeCheck.php > Hunk #1 FAILED at 20. > 1 out of 4 hunks FAILED -- saving rejects to file > includes/XmlTypeCheck.php.rej > patching file RELEASE-NOTES-1.19 > patching file tests/phpunit/includes/upload/UploadTest.php > > The wikis are 1.19.18; I forget what I installed them as, but I've > been applying the differential patches as they came out. This is the > first one I've had the slightest hiccup with. > > So is it just me? > > > - d. > > ___ > Wikitech-l mailing list > Wikitech-l@lists.wikimedia.org > https://lists.wikimedia.org/mailman/listinfo/wikitech-l I just tried the following: bawolff@Bawolff-L:/var/www/w/git/includes$ git checkout 1.19.18 Checking out files: 100% (4472/4472), done. Note: checking out '1.19.18'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at a107915... Updated release notes and version number to MediaWiki 1.19.18 bawolff@Bawolff-L:/var/www/w/git/includes$ cd ../ bawolff@Bawolff-L:/var/www/w/git$ patch -p1 < ~/mediawiki-1.19.19.patch patching file includes/DefaultSettings.php patching file includes/Sanitizer.php patching file includes/upload/UploadBase.php patching file includes/XmlTypeCheck.php patching file RELEASE-NOTES-1.19 patching file tests/phpunit/includes/upload/UploadTest.php - So provided that the 1.19.18 tarball/patch gets thing up to precisely where git has 1.19.18 tagged (a107915), then the patch seems to work fine. --bawolff ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
Re: [Wikitech-l] MediaWiki Security and Maintenance Releases: 1.19.19, 1.22.11 and 1.23.4
On 24 September 2014 23:28, Markus Glaser wrote: > Patch to previous version (1.19.18): > https://releases.wikimedia.org/mediawiki/1.19/mediawiki-1.19.19.patch.gz So I downloaded and applied this. gunzipped it, got this: -rw-r--r-- 1 root root 13663 Sep 24 21:35 mediawiki-1.19.19.patch Applied it, and got this (on two different wikis): # patch -p1 --dry-run < mediawiki-1.19.19.patch patching file includes/DefaultSettings.php patching file includes/Sanitizer.php patching file includes/upload/UploadBase.php patching file includes/XmlTypeCheck.php Hunk #1 FAILED at 20. 1 out of 4 hunks FAILED -- saving rejects to file includes/XmlTypeCheck.php.rej patching file RELEASE-NOTES-1.19 patching file tests/phpunit/includes/upload/UploadTest.php The wikis are 1.19.18; I forget what I installed them as, but I've been applying the differential patches as they came out. This is the first one I've had the slightest hiccup with. So is it just me? - d. ___ Wikitech-l mailing list Wikitech-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikitech-l
[Wikitech-l] MediaWiki Security and Maintenance Releases: 1.19.19, 1.22.11 and 1.23.4
Hello everyone, I would like to announce the release of MediaWiki 1.19.19, 1.22.11 and 1.23.4. This is a regular security and maintenance release. Download links are given at the end of this email. == Security == * (bug 69008) SECURITY: Enhance CSS filtering in SVG files. Filter
