You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/27 15:33:01 UTC
svn commit: r1151460 - in /subversion/branches/1.6.x: ./ STATUS get-deps.sh
Author: hwright
Date: Wed Jul 27 13:33:00 2011
New Revision: 1151460
URL: http://svn.apache.org/viewvc?rev=1151460&view=rev
Log:
Reintegrate the 1.6.x-r1134734 branch:
* r1134734
Fix sqlite-amalgamation location and archive format.
Branch:
1.6.x-r1134734
Justification:
Users report get-deps.sh of sqlite is currently broken.
Notes:
r1134734 also bumped dependency versions; the backport branch excludes
those bumps.
Votes:
+1: danielsh, arfrever, julianfoad
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/get-deps.sh (contents, props changed)
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 27 13:33:00 2011
@@ -44,6 +44,7 @@
/subversion/branches/1.6.x-r1068988:1070588-1072337
/subversion/branches/1.6.x-r1072084:1072274-1100234
/subversion/branches/1.6.x-r1104309:1104318-1124170
+/subversion/branches/1.6.x-r1134734:1138976-1151459
/subversion/branches/1.6.x-r36178:877876-877884
/subversion/branches/1.6.x-r36252:876328-876788
/subversion/branches/1.6.x-r37622:877699-877993
@@ -119,4 +120,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,
879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880027,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1
000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036429,1036534,1036978,1037762,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063572-1063573,1063592,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1074572,1076730,1076759,1076826,1078954,1081255,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1102803,1103665,1104309,1125983,1125998,1126007,1126810,1130303,1130448,1151036
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878590,878595,878607,878625-878627,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,
879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880027,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939000,939002,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1
000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028084,1028108,1028125,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036429,1036534,1036978,1037762,1038792,1039040,1041438,1041638,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1053984,1058269,1058722,1063572-1063573,1063592,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1074572,1076730,1076759,1076826,1078954,1081255,1084575,1084581,1084764,1084962,1084978,1086222,1094692,1095654,1098608,1102803,1103665,1104309,1125983,1125998,1126007,1126810,1130303,1130448,1134734,1151036
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1151460&r1=1151459&r2=1151460&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Jul 27 13:33:00 2011
@@ -233,18 +233,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1134734
- Fix sqlite-amalgamation location and archive format.
- Branch:
- 1.6.x-r1134734
- Justification:
- Users report get-deps.sh of sqlite is currently broken.
- Notes:
- r1134734 also bumped dependency versions; the backport branch excludes
- those bumps.
- Votes:
- +1: danielsh, arfrever, julianfoad
-
* r1144316
Issue 3953: reject invalid svn:mergeinfo at commit time over DAV.
Justification:
Modified: subversion/branches/1.6.x/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/get-deps.sh?rev=1151460&r1=1151459&r2=1151460&view=diff
==============================================================================
--- subversion/branches/1.6.x/get-deps.sh (original)
+++ subversion/branches/1.6.x/get-deps.sh Wed Jul 27 13:33:00 2011
@@ -28,8 +28,8 @@ APR_UTIL=apr-util-1.3.11
NEON=neon-0.28.3
SERF=serf-0.7.0
ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.5
-SQLITE=sqlite-amalgamation-$SQLITE_VERSION
+SQLITE_VERSION=3.7.5.0
+SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
HTTPD=httpd-2.2.18
APR_ICONV=apr-iconv-1.2.1
@@ -50,18 +50,18 @@ get_deps() {
wget -nc http://webdav.org/neon/$NEON.tar.gz
wget -nc http://serf.googlecode.com/files/$SERF.tar.bz2
wget -nc http://www.zlib.net/$ZLIB.tar.bz2
- wget -nc http://www.sqlite.org/$SQLITE.tar.gz
+ wget -nc http://www.sqlite.org/$SQLITE.zip
cd $BASEDIR
gzip -dc $TEMPDIR/$NEON.tar.gz | tar -xf -
bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf -
bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
- gzip -dc $TEMPDIR/$SQLITE.tar.gz | tar -xf -
+ unzip -q $TEMPDIR/$SQLITE.zip
mv $NEON neon
mv $ZLIB zlib
mv $SERF serf
- mv sqlite-$SQLITE_VERSION sqlite-amalgamation
+ mv $SQLITE sqlite-amalgamation
bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
Propchange: subversion/branches/1.6.x/get-deps.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 27 13:33:00 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215/get-deps.sh:870312
+/subversion/branches/1.6.x-r1134734/get-deps.sh:1138976-1151459
/subversion/branches/1.6.x-r878590/get-deps.sh:1104266-1104381
/subversion/branches/atomic-revprop/get-deps.sh:965046-1000689
/subversion/branches/bdb-reverse-deltas/get-deps.sh:872050-872529