Skip to content

Commit

Permalink
Item13787: More patch updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@gac410
gac410 committed Nov 4, 2015
1 parent 9f058f8 commit e8b06fb
Show file tree
Hide file tree
Showing 49 changed files with 1,717 additions and 254 deletions.
9 changes: 9 additions & 0 deletions PatchRelease01x01Contrib/lib/Foswiki/Contrib/PatchRelease01x01Contrib/MANIFEST
View file
Expand Up @@ -21,6 +21,9 @@ working/configure/patch/Item12391-112.patch 0664
working/configure/patch/Item12391-116.patch 0664
working/configure/patch/Item12391-117.patch 0664
working/configure/patch/Item12414-118.patch 0664
working/configure/patch/Item12616-110.patch 0664
working/configure/patch/Item12616-114.patch 0664
working/configure/patch/Item12616-116.patch 0664
working/configure/patch/Item12616-117.patch 0664
working/configure/patch/Item12616-118.patch 0664
working/configure/patch/Item12849-110.patch 0664
Expand All @@ -38,6 +41,12 @@ working/configure/patch/Item13775-116.patch 0664
working/configure/patch/Item13775-117.patch 0664
working/configure/patch/Item13775-118.patch 0664
working/configure/patch/Item13775-119.patch 0664
working/configure/patch/Item13777-111.patch 0664
working/configure/patch/Item13777-112.patch 0664
working/configure/patch/Item13777-113.patch 0664
working/configure/patch/Item13777-114.patch 0664
working/configure/patch/Item13777-115.patch 0664
working/configure/patch/Item13777-116.patch 0664
working/configure/patch/Item13777-118.patch 0664
working/configure/patch/Item13777-119.patch 0664

6 changes: 6 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item10963-110.patch
View file
@@ -1,3 +1,9 @@
Item10963: perl 5.14 qw deprecation breaks Foswiki

This patch must be applied to Foswiki 1.1.0 prior to moving to Perl 5.14
Applies to Foswiki 1.1.0-1.1.3. Fixed in Foswiki 1.1.4


~~~PATCH ebda758663bc6f5e2438aa9104f1fd4a:773bb3e7d5c62249507bb71e372fbe0b lib/Foswiki/Configure/Checkers/BasicSanity.pm (Foswiki-1.1.0)
diff --git lib/Foswiki/Configure/Checkers/BasicSanity.pm lib/Foswiki/Configure/Checkers/BasicSanity.pm
index 68ed3b1..85973c8 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item10963-111.patch
View file
@@ -1,3 +1,8 @@
Item10963: perl 5.14 qw deprecation breaks Foswiki

This patch must be applied to Foswiki 1.1.1 prior to moving to Perl 5.14
Applies to Foswiki 1.1.0-1.1.3. Fixed in Foswiki 1.1.4

~~~PATCH ebda758663bc6f5e2438aa9104f1fd4a:773bb3e7d5c62249507bb71e372fbe0b lib/Foswiki/Configure/Checkers/BasicSanity.pm (Foswiki-1.1.1)
diff --git lib/Foswiki/Configure/Checkers/BasicSanity.pm lib/Foswiki/Configure/Checkers/BasicSanity.pm
index 68ed3b1..85973c8 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item10963-112.patch
View file
@@ -1,3 +1,8 @@
Item10963: perl 5.14 qw deprecation breaks Foswiki

This patch must be applied to Foswiki 1.1.2 prior to moving to Perl 5.14
Applies to Foswiki 1.1.0-1.1.3. Fixed in Foswiki 1.1.4

~~~PATCH ebda758663bc6f5e2438aa9104f1fd4a:773bb3e7d5c62249507bb71e372fbe0b lib/Foswiki/Configure/Checkers/BasicSanity.pm (Foswiki-1.1.2)
diff --git lib/Foswiki/Configure/Checkers/BasicSanity.pm lib/Foswiki/Configure/Checkers/BasicSanity.pm
index 68ed3b1..85973c8 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item10963-113.patch
View file
@@ -1,3 +1,8 @@
Item10963: perl 5.14 qw deprecation breaks Foswiki

This patch must be applied to Foswiki 1.1.3 prior to moving to Perl 5.14
Applies to Foswiki 1.1.0-1.1.3. Fixed in Foswiki 1.1.4

~~~PATCH ebda758663bc6f5e2438aa9104f1fd4a:773bb3e7d5c62249507bb71e372fbe0b lib/Foswiki/Configure/Checkers/BasicSanity.pm (Foswiki-1.1.3)
diff --git lib/Foswiki/Configure/Checkers/BasicSanity.pm lib/Foswiki/Configure/Checkers/BasicSanity.pm
index 68ed3b1..85973c8 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item11955-110.patch
View file
@@ -1,3 +1,8 @@
Item11955: Configure fails with new RCS version, Argument "5.8.1" isn't numeric in numeric lt (<)

This patch must be applied to Foswiki 1.1.0 prior to upgrading RCS system tools.
Applies to Foswiki 1.1.0-1.1.4. Fixed in Foswiki 1.1.5

~~~PATCH f59e95728ca96aef5580d8e22ce53668:780a36c6c93e6d224b70c31c7a999177 lib/Foswiki/Configure/Checker.pm (Foswiki-1.1.0)
diff --git lib/Foswiki/Configure/Checker.pm lib/Foswiki/Configure/Checker.pm
index 9c68673..de371e0 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item11955-111.patch
View file
@@ -1,3 +1,8 @@
Item11955: Configure fails with new RCS version, Argument "5.8.1" isn't numeric in numeric lt (<)

This patch must be applied to Foswiki 1.1.1-1.1.2 prior to upgrading RCS system tools.
Applies to Foswiki 1.1.0-1.1.4. Fixed in Foswiki 1.1.5

~~~PATCH 114626ac313d886be0778f3034f60253:db8f138607142e9b1ba3b458974fa68b lib/Foswiki/Configure/Checker.pm (Foswiki-1.1.1,Foswiki-1.1.2)
diff --git lib/Foswiki/Configure/Checker.pm lib/Foswiki/Configure/Checker.pm
index 17bcbe6..dab4736 100644
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item11955-113.patch
View file
@@ -1,3 +1,8 @@
Item11955: Configure fails with new RCS version, Argument "5.8.1" isn't numeric in numeric lt (<)

This patch must be applied to Foswiki 1.1.3 prior to upgrading RCS system tools.
Applies to Foswiki 1.1.0-1.1.4. Fixed in Foswiki 1.1.5

~~~PATCH 10963a703a4b5a6c3ab2bb4a32d6fd0d:81400a9ed8792d8ddf96835da2a98ace lib/Foswiki/Configure/Checker.pm (Foswiki-1.1.3)
diff --git lib/Foswiki/Configure/Checker.pm lib/Foswiki/Configure/Checker.pm
--- lib/Foswiki/Configure/Checker.pm
Expand Down
5 changes: 5 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item11955-114.patch
View file
@@ -1,3 +1,8 @@
Item11955: Configure fails with new RCS version, Argument "5.8.1" isn't numeric in numeric lt (<)

This patch must be applied to Foswiki 1.1.4 prior to upgrading RCS system tools.
Applies to Foswiki 1.1.0-1.1.4. Fixed in Foswiki 1.1.5

~~~PATCH 8f46e24caa5bbbd4ecf8770b06a53da3:8e3934fae3480cdf6103c0edfd4e4363 lib/Foswiki/Configure/Checker.pm (Foswiki-1.1.4,Foswiki-1.1.5)
diff --git lib/Foswiki/Configure/Checker.pm lib/Foswiki/Configure/Checker.pm
--- lib/Foswiki/Configure/Checker.pm
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-110.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH 76e28354522a6d6cccc76c66f99d2424:24ce3ef562c0021782b103c81774b980 lib/Foswiki/Configure/UIs/EXTENSIONS.pm (Foswiki-1.1.0)
--- lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:45:21.269274066 -0500
+++ lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:46:39.844344573 -0500
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-111.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH 76e28354522a6d6cccc76c66f99d2424:24ce3ef562c0021782b103c81774b980 lib/Foswiki/Configure/UIs/EXTENSIONS.pm (Foswiki-1.1.1)
--- lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:45:21.269274066 -0500
+++ lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:46:39.844344573 -0500
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-112.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH 76e28354522a6d6cccc76c66f99d2424:24ce3ef562c0021782b103c81774b980 lib/Foswiki/Configure/UIs/EXTENSIONS.pm (Foswiki-1.1.2)
--- lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:45:21.269274066 -0500
+++ lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:46:39.844344573 -0500
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-113.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH d50361c444fd18201d45e65345ef6624:b9dd383f85691a3907b7a5449d56d91d lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.3)
diff --git lib/Foswiki/Configure/Dependency.pm lib/Foswiki/Configure/Dependency.pm
--- lib/Foswiki/Configure/Dependency.pm
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-114.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH 4e525d29a245785ae810316835c18e62:70a6a0fd9f6a377f212beafc2e5758cd lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.4)
diff --git lib/Foswiki/Configure/Dependency.pm lib/Foswiki/Configure/Dependency.pm
--- lib/Foswiki/Configure/Dependency.pm
Expand Down
4 changes: 3 additions & 1 deletion PatchRelease01x01Contrib/working/configure/patch/Item12225-115.patch
View file
@@ -1,10 +1,12 @@
Item12225: Don't use "HEAD" to detect pseudo install.
Item12225: Plugins using new version system break older versions Foswiki

A real, non-pseudo-installed extension will crash configure if a perl
version object is compared to an alpha string.

9999.99_999 will be used to indicate a pseudo-installed release.

Item12225 applies to Foswiki 1.1.0-1.1.5. Fixed in Foswiki 1.1.6

~~~PATCH fdeeb7f236608b7792ad0845bf2279f9:17867f295278e3bd355bcce0327a60e3 lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.5)
diff --git lib/Foswiki/Configure/Dependency.pm lib/Foswiki/Configure/Dependency.pm
--- lib/Foswiki/Configure/Dependency.pm
Expand Down
5 changes: 3 additions & 2 deletions PatchRelease01x01Contrib/working/configure/patch/Item12285-112.patch
View file
@@ -1,6 +1,7 @@
Date: Mon Dec 10 00:49:20 2012 +0000
Item12285: Resolve MAKETEXT vulnerabilities CVE-2012-6329 and CVE-2012-6330.

Item12285: Better validations. This patch applies to Foswiki 1.1.0-1.1.2
Item12285 applies to Foswiki 1.1.0-1.1.6. This patch covers Foswiki 1.1.0-1.1.2
This patch superceded by Item12391.

~~~PATCH 72c86f0c71519caf6d26efbe174739f6:5218b3501c96c8e6017f4df81298ef5b lib/Foswiki/Macros/MAKETEXT.pm (Foswiki-1.1.0,Foswiki-1.1.1,Foswiki-1.1.2)
--- lib/Foswiki/Macros/MAKETEXT.pm 2010-10-04 11:26:34.000000000 -0400
Expand Down
6 changes: 3 additions & 3 deletions PatchRelease01x01Contrib/working/configure/patch/Item12285-116.patch
View file
@@ -1,7 +1,7 @@
Date: Mon Dec 10 00:49:20 2012 +0000

Item12285: Better validations This patch applies to Foswiki 1.1.3 - 1.1.6
Item12285: Resolve MAKETEXT vulnerabilities CVE-2012-6329 and CVE-2012-6330.

Item12285 applies to Foswiki 1.1.0-1.1.6. This patch covers Foswiki 1.1.3-1.1.6
This patch superceded by Item12391.

~~~PATCH 160f04fc478c5f9b81d2ef6c9e614074:fee73707cdd378ca45e87a47c7198de4 lib/Foswiki/Macros/MAKETEXT.pm (Foswiki-1.1.3,Foswiki-1.1.4,Foswiki-1.1.5,Foswiki-1.1.6)
--- lib/Foswiki/Macros/MAKETEXT.pm 2012-12-11 10:51:12.959268829 -0500
Expand Down
6 changes: 3 additions & 3 deletions PatchRelease01x01Contrib/working/configure/patch/Item12391-112.patch
View file
@@ -1,7 +1,7 @@
Author: GeorgeClark <GeorgeClark@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Wed Feb 13 00:49:20 2012 +0000
Item12391: Fix for SecurityAlert CVE-2013-1666

Item12391: More validations This patch applies to Foswiki 1.1.0-1.1.2 Post Item12285 patch
Item12391 applies to Foswiki 1.1.0-1.1.7. This patch covers Foswiki 1.1.0-1.1.2
This patch updates Item12285.

~~~PATCH 5218b3501c96c8e6017f4df81298ef5b:e89b823a46626febb00fe9f0f26ff332 lib/Foswiki/Macros/MAKETEXT.pm (Foswiki-1.1.0,Foswiki-1.1.1,Foswiki-1.1.2)
--- lib/Foswiki/Macros/MAKETEXT.pm 2013-02-13 11:00:18.037967200 -0500
Expand Down
8 changes: 4 additions & 4 deletions PatchRelease01x01Contrib/working/configure/patch/Item12391-116.patch
View file
@@ -1,10 +1,10 @@
Author: GeorgeClark <GeorgeClark@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Wed Feb 13 00:49:20 2012 +0000
Item12391: Fix for SecurityAlert CVE-2013-1666

Item12391: More validations This patch applies to Foswiki 1.1.3-1.1.6 post Item12285 patch
Item12391 applies to Foswiki 1.1.0-1.1.7. This patch covers Foswiki 1.1.3-1.1.6
This patch updates Item12285.

~~~PATCH fee73707cdd378ca45e87a47c7198de4:92a80e84b34d0fa442e077ffc2f8a86a lib/Foswiki/Macros/MAKETEXT.pm (Foswiki-1.1.3,Foswiki-1.1.4,Foswiki-1.1.5,Foswiki-1.1.6)
--- lib/Foswiki/Macros/MAKETEXT.pm.post12285 2013-02-13 10:26:42.520780283 -0500
--- lib/Foswiki/Macros/MAKETEXT.pm 2013-02-13 10:26:42.520780283 -0500
+++ lib/Foswiki/Macros/MAKETEXT.pm 2013-02-13 10:26:51.362682708 -0500
@@ -25,8 +25,8 @@
$str =~ s/\]/~]/g;
Expand Down
7 changes: 3 additions & 4 deletions PatchRelease01x01Contrib/working/configure/patch/Item12391-117.patch
View file
@@ -1,8 +1,7 @@
Author: GeorgeClark <GeorgeClark@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Wed Feb 13 00:49:20 2012 +0000

Item12391: More validations This patch applies to Foswiki 1.1.7
Item12391: Fix for SecurityAlert CVE-2013-1666

Item12391 applies to Foswiki 1.1.0-1.1.7. This patch covers Foswiki 1.1.7
This patch updates Item12285.

~~~PATCH b5740da4993721b129abccec62701f12:1f8c3f72bb673b074f46d0277d1e6cf9 lib/Foswiki/Macros/MAKETEXT.pm (Foswiki-1.1.7)
--- lib/Foswiki/Macros/MAKETEXT.pm 2012-12-23 10:44:07.000000000 -0500
Expand Down
9 changes: 2 additions & 7 deletions PatchRelease01x01Contrib/working/configure/patch/Item12414-118.patch
View file
@@ -1,13 +1,8 @@

~~~PATCH 5879fa7b665389d839ae149d551d8860:c151bafe3d209c0af44a534a64d9c9b8 lib/Foswiki/Sandbox.pm (Foswiki-1.1.6,Foswiki-1.1.7,Foswiki-1.1.8)
Date: Sat Mar 2 03:58:37 2013 +0000

Item12414: tempfile is not an object method.
Item12414: tempfile is not an object method.

Next version of File::Temp will die if called as File::Temp->tempfile()

git-svn-id: http://svn.foswiki.org/branches/Release01x01@16579 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

~~~PATCH 5879fa7b665389d839ae149d551d8860:c151bafe3d209c0af44a534a64d9c9b8 lib/Foswiki/Sandbox.pm (Foswiki-1.1.6,Foswiki-1.1.7,Foswiki-1.1.8)
diff --git lib/Foswiki/Sandbox.pm lib/Foswiki/Sandbox.pm
index fc0312b..9a465d5 100644
--- lib/Foswiki/Sandbox.pm
Expand Down
24 changes: 24 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item12616-110.patch
View file
@@ -0,0 +1,24 @@
Item12616: Foswiki encounters perl errors in 5.18, 5.19

Note, In Foswiki versions 1.1.0-1.1.5, this is a partial patch. It resolves a crash in Attach,
but does NOT address sort issues causesd by perl Hash order changes. Upgrade to Foswiki 1.1.9 or Foswiki 2.0 recommended.

~~~PATCH 551b4d3ce9e88f9369ab1cecaa0ed14e:438da03f13e1f92f38ed7576014346e3 lib/Foswiki/Attach.pm (Foswiki-1.1.0,Foswiki-1.1.1,Foswiki-1.1.2,Foswiki-1.1.3)
diff --git lib/Foswiki/Attach.pm lib/Foswiki/Attach.pm
index bb2396b..63eadc3 100644
--- lib/Foswiki/Attach.pm
+++ lib/Foswiki/Attach.pm
@@ -199,7 +199,12 @@ sub _expandAttrs {
return $comment;
}
elsif ( $attr eq 'ATTRS' ) {
- return $info->{attr} or "&nbsp;";
+ if ( $info->{attr} ) {
+ return $info->{attr};
+ }
+ else {
+ return "&nbsp;";
+ }
}
elsif ( $attr eq 'FILE' ) {
return $file;
24 changes: 24 additions & 0 deletions PatchRelease01x01Contrib/working/configure/patch/Item12616-114.patch
View file
@@ -0,0 +1,24 @@
Item12616: Foswiki encounters perl errors in 5.18, 5.19

Note, In Foswiki versions 1.1.0-1.1.5, this is a partial patch. It resolves a crash in Attach,
but does NOT address sort issues causesd by perl Hash order changes. Upgrade to Foswiki 1.1.9 or Foswiki 2.0 recommended.

~~~PATCH a14f23171b51a773fb0cdc569da94496:1189e340924aeb627b9e734bfe1d0b34 lib/Foswiki/Attach.pm (Foswiki-1.1.4,Foswiki-1.1.5)
diff --git lib/Foswiki/Attach.pm lib/Foswiki/Attach.pm
index bb2396b..63eadc3 100644
--- lib/Foswiki/Attach.pm
+++ lib/Foswiki/Attach.pm
@@ -199,7 +199,12 @@ sub _expandAttrs {
return $comment;
}
elsif ( $attr eq 'ATTRS' ) {
- return $info->{attr} or "&nbsp;";
+ if ( $info->{attr} ) {
+ return $info->{attr};
+ }
+ else {
+ return "&nbsp;";
+ }
}
elsif ( $attr eq 'FILE' ) {
return $file;

0 comments on commit e8b06fb

Please sign in to comment.