Skip to content

Commit

Permalink
Item12285: Update the patch
Browse files Browse the repository at this point in the history
Add a test to the patch topic so that the fix can be tested.

Clean up path information from the patch files.

git-svn-id: http://svn.foswiki.org/trunk/PatchItem12285Contrib@16217 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
GeorgeClark authored and GeorgeClark committed Dec 15, 2012
1 parent 29f4f7f commit 5449905
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions data/System/PatchItem12285Contrib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ This extensions applies a "hotfix" for Item12285 to your Foswiki 1.1.0 thru 1.1.
Foswiki vulnerability and should be installed as soon as possible. </div>
</blockquote>

If a warning about MAKETEXT Rejected is displayed here, your system is patched: %MAKETEXT{"[_101]"}%

When this extension is installed, it uses the Post-installation exit to apply any patch files found in the manifest. This extension ships with a hotfix for the following items:

| *Original Issue* | *Patch File* | *Description* | *Applies to* |
Expand Down Expand Up @@ -45,6 +47,7 @@ Note: This extension was re-released with a slightly different patch. It is st
| Dependencies: | %$DEPENDENCIES% |
| Version: | %$VERSION% |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 1.5 (12 Dec 2012) | Minor patch file cleanup. Remove file paths. |
| 1.4 (12 Dec 2012) | Split patch file so it can be used with patch utility as well. |
| 1.3 (10 Dec 2012) | Re-issue with more updates. |
| 1.2 (10 Dec 2012) | Reissue with different fix. |
Expand Down
4 changes: 2 additions & 2 deletions lib/Foswiki/Contrib/PatchItem12285Contrib.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use warnings;
# *must* exist in this package. This should always be in the format
# $Rev$ so that Foswiki can determine the checked-in status of the
# extension.
our $VERSION = '1.4';
our $VERSION = '1.5';

# $RELEASE is used in the "Find More Extensions" automation in configure.
# It is a manually maintained string used to identify functionality steps.
Expand All @@ -31,7 +31,7 @@ our $VERSION = '1.4';
# date - a date in 1 Jun 2009 format. Three letter English month names only.
# Note: it's important that this string is exactly the same in the extension
# topic - if you use %$RELEASE% with BuildContrib this is done automatically.
our $RELEASE = '1.4';
our $RELEASE = '1.5';

our $SHORTDESCRIPTION = 'Patch a critical vulnerability in Locale::Maketext.';

Expand Down
2 changes: 1 addition & 1 deletion working/configure/patch/Item12285-001.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Date: Mon Dec 10 00:49:20 2012 +0000
Item12285: Better validations. This patch applies to Foswiki 1.1.0-1.1.2

~~~PATCH 72c86f0c71519caf6d26efbe174739f6 lib/Foswiki/Macros/MAKETEXT.pm (Foswiki 1.1.0 - 1.1.2)
--- /home/gac/Foswiki/Foswiki-1.1.0/lib/Foswiki/Macros/MAKETEXT.pm 2010-10-04 11:26:34.000000000 -0400
--- lib/Foswiki/Macros/MAKETEXT.pm 2010-10-04 11:26:34.000000000 -0400
+++ lib/Foswiki/Macros/MAKETEXT.pm 2012-12-11 11:26:04.034507184 -0500
@@ -4,9 +4,19 @@
use strict;
Expand Down
2 changes: 1 addition & 1 deletion working/configure/patch/Item12285-002.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Date: Mon Dec 10 00:49:20 2012 +0000

~~~PATCH 160f04fc478c5f9b81d2ef6c9e614074 lib/Foswiki/Macros/MAKETEXT.pm (Foswiki 1.1.3 - Foswiki 1.1.6)
--- lib/Foswiki/Macros/MAKETEXT.pm 2012-12-11 10:51:12.959268829 -0500
+++ lib/Foswiki/Macros/MAKETEXT.pm.new 2012-12-11 10:37:31.674486503 -0500
+++ lib/Foswiki/Macros/MAKETEXT.pm 2012-12-11 10:37:31.674486503 -0500
@@ -4,9 +4,19 @@
use strict;
use warnings;
Expand Down

0 comments on commit 5449905

Please sign in to comment.