Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Item13787: Updating patch files for more releases.
- Loading branch information
Showing
32 changed files
with
532 additions
and
950 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
PatchRelease01x01Contrib/working/configure/patch/Item11267-001.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
commit 5e6b4d1f9540bb7b75705faf80e412fc0c66fe84 | ||
Author: GeorgeClark <GeorgeClark@0b4bb1d4-4e5a-0410-9cc4-b2b747904278> | ||
Date: Mon Nov 5 05:07:25 2012 +0000 | ||
|
||
Item11267: Don't use "HEAD" to detect pseudo install. | ||
Note: This patch fixes bug reported in Item12225 | ||
|
||
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. | ||
|
||
git-svn-id: http://svn.foswiki.org/trunk@15909 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 | ||
|
||
~~~PATCH 76e28354522a6d6cccc76c66f99d2424:24ce3ef562c0021782b103c81774b980 lib/Foswiki/Configure/UIs/EXTENSIONS.pm (Foswiki-1.1.0,Foswiki-1.1.1,Foswiki-1.1.2,Foswiki-1.1.3,Foswiki-1.1.4,Foswiki-1.1.5) | ||
--- lib/Foswiki/Configure/UIs/EXTENSIONS.pm 2012-11-07 23:45:21.269274066 -0500 | ||
+++ lib/Foswiki/Configure/UIs/EXTENSIONS.pm.new 2012-11-07 23:46:39.844344573 -0500 | ||
@@ -280,7 +280,7 @@ | ||
if ( $ext->{installedRelease} ) { | ||
|
||
# The module is installed; check the version | ||
- if ( $ext->{installedVersion} eq 'HEAD' ) { | ||
+ if ( $ext->{installedVersion} eq '9999.99_999' ) { | ||
|
||
# pseudo-installed | ||
$install = 'pseudo-installed'; | ||
|
||
~~~PATCH 491da6d7e2ec5695532924a322d00775:62615300a753905267c1620321a1c51e lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.0) | ||
--- lib/Foswiki/Configure/Dependency.pm 2010-10-04 11:26:34.000000000 -0400 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-08 18:06:36.866582897 -0500 | ||
@@ -218,7 +218,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
~~~PATCH 761e2ab62309739b740cb506bd6f2cc3:0276c444cd7d5068434f7be5c88a7e6d lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.1) | ||
--- lib/Foswiki/Configure/Dependency.pm 2010-10-25 17:58:13.000000000 -0400 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-08 18:09:42.117464357 -0500 | ||
@@ -218,7 +218,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
~~~PATCH b865e17f72f28a16cf39a7f0af0f8ddc:74546e2a4f1d06582d53b780a641c509 lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.2) | ||
--- lib/Foswiki/Configure/Dependency.pm 2010-11-09 19:29:12.000000000 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-08 18:12:03.809843937 -0500 | ||
@@ -218,7 +218,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
~~~PATCH 6f2c6eb77ffbc95a4068e584bd5d1aa5:f446c7779d79cb9b9a59fa4cf62cd657 lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.3) | ||
--- lib/Foswiki/Configure/Dependency.pm 2011-04-16 16:29:33.000000000 -0400 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-08 18:15:42.067347880 -0500 | ||
@@ -220,7 +220,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
~~~PATCH 4e525d29a245785ae810316835c18e62:221ccfdb31d41b8d376a5e095003e88d lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.4) | ||
--- lib/Foswiki/Configure/Dependency.pm 2011-12-20 10:33:22.000000000 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm 2012-11-08 17:05:55.982213647 -0500 | ||
@@ -220,7 +220,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
~~~PATCH fdeeb7f236608b7792ad0845bf2279f9:8da49fcc5b7babb0661a1ec2979a03c7 lib/Foswiki/Configure/Dependency.pm (Foswiki-1.1.5) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-07 23:46:56.378148979 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-07 23:46:14.091649218 -0500 | ||
@@ -220,7 +220,7 @@ | ||
if ( -l "$dir/$path" ) { | ||
|
||
# Assume pseudo-installed | ||
- $this->{installedVersion} = 'HEAD'; | ||
+ $this->{installedVersion} = '9999.99_999'; | ||
} | ||
last; | ||
} | ||
|
||
|
89 changes: 89 additions & 0 deletions
89
PatchRelease01x01Contrib/working/configure/patch/Item11267-002.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
commit be45aa83ccc16a570064d2512bd807a1b01b6dbd | ||
Author: GeorgeClark <GeorgeClark@0b4bb1d4-4e5a-0410-9cc4-b2b747904278> | ||
Date: Mon Nov 26 04:32:23 2012 +0000 | ||
|
||
Item11267: Don't reinstall extensions | ||
|
||
Some existing extensions have dependencies based on SVN Rev strings. New | ||
modules as of 1.1.6, don't have the rev string available. | ||
|
||
Dependency.pm is changed to assume that if a dependency is trying to | ||
compare a svn revision to an installed dotted decimal version, then the | ||
dependency is automatically met. | ||
|
||
DEPENDENCY: This patch must be applied AFTER Item11267-001.patch | ||
|
||
git-svn-id: http://svn.foswiki.org/branches/Release01x01@16103 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 | ||
|
||
~~~PATCH 8da49fcc5b7babb0661a1ec2979a03c7:17867f295278e3bd355bcce0327a60e3 lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.5) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-15 11:13:21.346451222 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 11:35:17.931786783 -0500 | ||
@@ -459,6 +459,7 @@ | ||
#print STDERR "Expecting SVN comparison, but RELEASE was $baseType \n"; | ||
( $baseType, @atuple ) = _decodeReleaseString($aVERSION) | ||
if ( defined $aVERSION && $baseType ne 'svn' ); | ||
+ return 1 if ( $baseType eq 'tuple' ); | ||
return 0 unless ( $baseType eq 'svn' ); | ||
|
||
} | ||
|
||
~~~PATCH 221ccfdb31d41b8d376a5e095003e88d:70a6a0fd9f6a377f212beafc2e5758cd lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.4) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-28 11:43:17.827220321 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 11:40:57.174840122 -0500 | ||
@@ -459,6 +459,7 @@ | ||
#print STDERR "Expecting SVN comparison, but RELEASE was $baseType \n"; | ||
( $baseType, @atuple ) = _decodeReleaseString($aVERSION) | ||
if ( defined $aVERSION && $baseType ne 'svn' ); | ||
+ return 1 if ( $baseType eq 'tuple' ); | ||
return 0 unless ( $baseType eq 'svn' ); | ||
|
||
} | ||
|
||
~~~PATCH f446c7779d79cb9b9a59fa4cf62cd657:d02e6f96ebef1d1487af0d20333c827f lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.3) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-28 11:46:00.510356565 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 11:47:26.272377754 -0500 | ||
@@ -459,6 +459,7 @@ | ||
#print STDERR "Expecting SVN comparison, but RELEASE was $baseType \n"; | ||
( $baseType, @atuple ) = _decodeReleaseString($aVERSION) | ||
if ( defined $aVERSION && $baseType ne 'svn' ); | ||
+ return 1 if ( $baseType eq 'tuple' ); | ||
return 0 unless ( $baseType eq 'svn' ); | ||
|
||
} | ||
|
||
~~~PATCH 74546e2a4f1d06582d53b780a641c509:615f4a43b9ef72a732d2e4ac4cfa9981 lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.2) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-28 11:48:54.014378721 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 12:00:33.706477574 -0500 | ||
@@ -466,6 +466,7 @@ | ||
|
||
# Didn't get a good RELEASE; fall back to subversion | ||
return 0 unless defined $aVERSION; | ||
+ return 1 if ( $aVERSION =~ /^v?\d+\.\d+/ ); # a Dotted Decimal version string | ||
$aVERSION =~ s/^\s+//; | ||
$aVERSION =~ s/\s+$//; | ||
$aVERSION =~ s/^\$Rev: (\d+).*\$$/$1/; | ||
|
||
~~~PATCH 0276c444cd7d5068434f7be5c88a7e6d:23d1bcea2820c6c25c4f1cf0d4bd8dda lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.1) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-28 12:35:38.838933114 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 12:37:24.818753945 -0500 | ||
@@ -466,6 +466,7 @@ | ||
|
||
# Didn't get a good RELEASE; fall back to subversion | ||
return 0 unless defined $aVERSION; | ||
+ return 1 if ( $aVERSION =~ /^v?\d+\.\d+/ ); # a Dotted Decimal version string | ||
$aVERSION =~ s/^\s+//; | ||
$aVERSION =~ s/\s+$//; | ||
$aVERSION =~ s/^\$Rev: (\d+).*\$$/$1/; | ||
|
||
~~~PATCH 62615300a753905267c1620321a1c51e:db9e7f7278873cc93d01c0607e18c17f lib/Foswiki/Configure/Dependency.pm (Foswiki 1.1.0) | ||
--- lib/Foswiki/Configure/Dependency.pm 2012-11-28 12:38:58.889707506 -0500 | ||
+++ lib/Foswiki/Configure/Dependency.pm.new 2012-11-28 12:40:25.150748111 -0500 | ||
@@ -466,6 +466,7 @@ | ||
|
||
# Didn't get a good RELEASE; fall back to subversion | ||
return 0 unless defined $aVERSION; | ||
+ return 1 if ( $aVERSION =~ /^v?\d+\.\d+/ ); # a Dotted Decimal version string | ||
$aVERSION =~ s/^\s+//; | ||
$aVERSION =~ s/\s+$//; | ||
$aVERSION =~ s/^\$Rev: (\d+).*\$$/$1/; | ||
|
67 changes: 0 additions & 67 deletions
67
PatchRelease01x01Contrib/working/configure/patch/Item11267-110.patch
This file was deleted.
Oops, something went wrong.
69 changes: 0 additions & 69 deletions
69
PatchRelease01x01Contrib/working/configure/patch/Item11267-111.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.