subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1692665 [1/3] - in /subversion/branches/1.7.x-r1542765: ./ build/ac-macros/ build/generator/ build/generator/templates/ subversion/bindings/javahl/native/ subversion/bindings/swig/include/ subversion/include/ subversion/include/private/ su...
Date Sat, 25 Jul 2015 21:43:58 GMT
Author: brane
Date: Sat Jul 25 21:43:57 2015
New Revision: 1692665

URL: http://svn.apache.org/r1692665
Log:
On the 1.7.x-r1542765 branch: Sync with the 1.7.x branch.

Added:
    subversion/branches/1.7.x-r1542765/subversion/include/private/svn_cert.h
      - copied unchanged from r1692664, subversion/branches/1.7.x/subversion/include/private/svn_cert.h
Modified:
    subversion/branches/1.7.x-r1542765/   (props changed)
    subversion/branches/1.7.x-r1542765/CHANGES   (contents, props changed)
    subversion/branches/1.7.x-r1542765/NOTICE   (contents, props changed)
    subversion/branches/1.7.x-r1542765/STATUS
    subversion/branches/1.7.x-r1542765/autogen.sh
    subversion/branches/1.7.x-r1542765/build.conf
    subversion/branches/1.7.x-r1542765/build/ac-macros/apache.m4
    subversion/branches/1.7.x-r1542765/build/ac-macros/berkeley-db.m4
    subversion/branches/1.7.x-r1542765/build/ac-macros/serf.m4
    subversion/branches/1.7.x-r1542765/build/generator/gen_vcnet_vcproj.py
    subversion/branches/1.7.x-r1542765/build/generator/gen_win.py
    subversion/branches/1.7.x-r1542765/build/generator/templates/build_zlib.ezt
    subversion/branches/1.7.x-r1542765/build/generator/templates/svn_config.vcxproj.ezt
    subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcproj.ezt
    subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcxproj.ezt
    subversion/branches/1.7.x-r1542765/build/generator/templates/zlib.vcxproj.ezt
    subversion/branches/1.7.x-r1542765/configure.ac
    subversion/branches/1.7.x-r1542765/gen-make.py
    subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.h
    subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/apr.swg
    subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/1.7.x-r1542765/subversion/include/svn_io.h
    subversion/branches/1.7.x-r1542765/subversion/include/svn_version.h
    subversion/branches/1.7.x-r1542765/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_client/copy.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_client/delete.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_client/externals.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_client/patch.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_delta/svndiff.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_diff/diff_file.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_ra_serf/util.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_repos/dump.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_subr/config.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_subr/config_auth.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_subr/error.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_subr/opt.c
    subversion/branches/1.7.x-r1542765/subversion/libsvn_wc/wc_db.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/deadprops.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/deleted-rev.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/file-revs.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/get-location-segments.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/get-locations.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/log.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/reports/mergeinfo.c
    subversion/branches/1.7.x-r1542765/subversion/mod_dav_svn/repos.c
    subversion/branches/1.7.x-r1542765/subversion/svnrdump/load_editor.c
    subversion/branches/1.7.x-r1542765/subversion/svnserve/serve.c
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/checkout_tests.py
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/commit_tests.py
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/copy_tests.py
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/patch_tests.py
    subversion/branches/1.7.x-r1542765/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/1.7.x-r1542765/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/1.7.x-r1542765/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/1.7.x-r1542765/subversion/tests/libsvn_subr/dirent_uri-test.c

Propchange: subversion/branches/1.7.x-r1542765/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 25 21:43:57 2015
@@ -1,7 +1,10 @@
 /subversion/1.7.x-issue4059:1239661-1239744
 /subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x:1571486-1692664
 /subversion/branches/1.7.x-JavaHL-pools:1158684-1158722
+/subversion/branches/1.7.x-buildfix-neon:1660567-1664788
 /subversion/branches/1.7.x-diff-translate:1568403-1569065
+/subversion/branches/1.7.x-disable_zlib_asm:1593915-1615219
 /subversion/branches/1.7.x-fsfs-commit:1536760-1541380
 /subversion/branches/1.7.x-gssapi-solaris10:1453164-1515067
 /subversion/branches/1.7.x-issue3888:1148937-1149162
@@ -29,8 +32,12 @@
 /subversion/branches/1.7.x-issue4408:1512143-1514943
 /subversion/branches/1.7.x-issue4428:1525912-1538136
 /subversion/branches/1.7.x-issue4460:1563069-1564892
+/subversion/branches/1.7.x-issue4480:1588781-1590205
+/subversion/branches/1.7.x-issue4551:1654802-1687153
 /subversion/branches/1.7.x-issue4k:1166502-1167193
+/subversion/branches/1.7.x-javahl-exception-crash:1586451-1589333
 /subversion/branches/1.7.x-log-diff:1295670-1295699
+/subversion/branches/1.7.x-md5-collision:1600982-1615192
 /subversion/branches/1.7.x-neon-0.30:1566319-1568587
 /subversion/branches/1.7.x-neon-default:1148803-1158680
 /subversion/branches/1.7.x-neon-properr:1440619-1461944
@@ -43,6 +50,7 @@
 /subversion/branches/1.7.x-r1201824:1202121-1207333
 /subversion/branches/1.7.x-r1210147:1213310-1293110
 /subversion/branches/1.7.x-r1213331:1213684-1213756
+/subversion/branches/1.7.x-r1227815-conflict:1642662-1643026
 /subversion/branches/1.7.x-r1232221:1232358-1238008
 /subversion/branches/1.7.x-r1236343:1236628-1239394
 /subversion/branches/1.7.x-r1242759:1372522-1393041
@@ -69,16 +77,35 @@
 /subversion/branches/1.7.x-r1426762:1538732-1538859
 /subversion/branches/1.7.x-r1427278:1433724-1485338
 /subversion/branches/1.7.x-r1461743:1461745-1482189
+/subversion/branches/1.7.x-r1462041:1617243-1641028
 /subversion/branches/1.7.x-r1475724:1475743-1482192
 /subversion/branches/1.7.x-r1481010:1481034-1482194
 /subversion/branches/1.7.x-r1482759:1483584-1485046
 /subversion/branches/1.7.x-r1507044:1507300-1511568
 /subversion/branches/1.7.x-r1527103:1527110-1541378
 /subversion/branches/1.7.x-r1541790:1541792-1542083
+/subversion/branches/1.7.x-r1551579:1551587-1589566
+/subversion/branches/1.7.x-r1561419:1655580-1687155
 /subversion/branches/1.7.x-r1564215:1564280-1564618
 /subversion/branches/1.7.x-r1568872-neon+serf:1568942-1569623
+/subversion/branches/1.7.x-r1574868:1575332-1642628
+/subversion/branches/1.7.x-r1580626:1580636-1590207
+/subversion/branches/1.7.x-r1594157:1594673-1643028
+/subversion/branches/1.7.x-r1641564:1641574-1642630
+/subversion/branches/1.7.x-r1644595:1644692-1667437
+/subversion/branches/1.7.x-r1646797:1646806-1664786
+/subversion/branches/1.7.x-r1667941:1667944-1668188
+/subversion/branches/1.7.x-r1674455:1674471-1687159
+/subversion/branches/1.7.x-san-cert:1614969-1615212
+/subversion/branches/1.7.x-serf-1.3.x-Windows:1543441-1589564
 /subversion/branches/1.7.x-serf-server-root-segfaults:1383952-1392726
 /subversion/branches/1.7.x-svn-patch-eol-fixes:1207511-1235924
+/subversion/branches/1.8.x:1577779
+/subversion/branches/1.8.x-issue4480:1588775
+/subversion/branches/1.8.x-issue4551:1654799
+/subversion/branches/1.8.x-javahl-exception-crash:1586439
+/subversion/branches/1.8.x-openssl-dirs:1535139
+/subversion/branches/1.8.x-serf-1.3+-windows:1517123
 /subversion/branches/atomic-revprop:965046-1000689
 /subversion/branches/bdb-reverse-deltas:872050-872529
 /subversion/branches/diff-callbacks3:870059-870761
@@ -133,4 +160,6 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
 6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
 1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
 82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
 92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
 ,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462293,1462300,1462302,1462321,1462334,1465975,1476
 359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542765,1544295,1544316,1557320,1560690,1561237,1563066-1563068,1564215,1564966,1564969,1567080,1568872,1569069,1571214
+/subversion/branches/v1.7.x-VS2012-15:1667823-1687157
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,115
 6085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1177732,
 1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,1212476,12124
 82,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,1292296,12
 92322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,1367498
 ,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1386594,1386601,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462041,1462293,1462300,1462302,1462
 321,1462334,1465975,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1496127,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1542610,1542765,1544295,1544302-1544303,1544316,1545835,1545845,1550691,1550772,1551579,1557320,1560690,1561237,1561419,1563066-1563068,1564215,1564576,1564966,1564969,1565531,1566503,1567080,1567492,1567494,1568180,1568349,1568872,1569069,1571214,1574868,1577200,1577739,1577755,1580626,1580650,1587968,1588772,1590212,1591123,1594156,1595431,1600909,1615219,1615255-1615256,1636874,1637826,1640730,1640862,1640873,1641564,1643033,1643409,1643437,1643457,1643793,1643810,1643972,1644158,1644530,1644595,1644599,1646785-1646786,1646797,1651759,1652182,1652195,1652200,1652744,1653622-1
 653623,1653988,1654039,1654162,1654186,1654271,1664612,1667233,1667235,1667260-1667261,1667485,1667941,1667976,1668618,1671388,1674455-1674456
+/subversion/trunk/subversion/tests:1652182

Modified: subversion/branches/1.7.x-r1542765/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/CHANGES?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/CHANGES (original)
+++ subversion/branches/1.7.x-r1542765/CHANGES Sat Jul 25 21:43:57 2015
@@ -1,3 +1,103 @@
+Version 1.7.20
+(31 Mar 2015, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.20
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * fix 'svn patch' output for reordered hunks (issue #4533)
+
+  - Server-side bugfixes:
+    * reject invalid get-location-segments requests in mod_dav_svn and
+      svnserve (r1667233)
+    * mod_dav_svn: reject invalid txnprop change requests (r1667235)
+
+  - Client-side and server-side bugfixes:
+    * properly duplicate svn error objects (r1651759)
+    * fix use-after-free in config parser (1646785, r1646786, r1646797)
+
+ Developer-visible changes:
+  * add lock file config for testing against HTTPD 2.4+ (r1544302, r1544303)
+  * fix build with absolute path to neon install (r1664789)
+
+
+Version 1.7.19
+(15 Dec 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.19
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * rm: display the proper URL in commit log editor (r1591123)
+    * diff: fix invalid read during suffix scanning (issue #4339)
+    * fix crash in eclipse IDE with GNOME Keyring (issue #3498)
+    * checkout/update: fix file externals failing to follow history and
+      subsequently silently failing (issue #4185)
+
+  - Server-side bugfixes:
+    * svnadmin dump: don't let invalid mergeinfo prevent a dump (issue #4476)
+    * mod_dav_svn: reject requests with missing repository paths (r1643409)
+    * mod_dav_svn: reject requests with invalid virtual transaction names
+      (r1643437)
+    * mod_dav_svn: avoid unneeded memory growth in resource walking
+      (issue #4531)
+
+ Developer-visible changes:
+  - General:
+    * properly generate a version resource when building on Windows (r1542610,
+      r1564576, r1568180)
+    * fix a problem with the unix build that could result in linking to the
+      wrong Subversion libraries at build or at run time (r1594157)
+    * use a proper intermediate directory when building with Visual Studio
+      2003-2008 (r1595431)
+    * fix LIBTOOL_M4 and LIBTOOL_CONFIG variable not be evaluated properly
+      during a unix build (r1637826)
+    * allow the use of libtool 2.4.3 (r1640862, r1640873, r1643793)
+
+
+Version 1.7.18
+(11 Aug 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.18
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * guard against md5 hash collisions when finding cached credentials
+        (r1550691, r1550772, r1600909)
+    * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+    * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+        Names (r1565531, r1566503, r1568349)
+
+ Developer-visible changes:
+  - General:
+    * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+    * disable building ZLib's assembly optimizations on Windows.
+
+
+Version 1.7.17
+(07 May 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.17
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * log: use proper peg revision over DAV (r1568872)
+    * move: fix errors when moving files between an external and the parent
+      working copy (r1551579)
+    * copy: fix 'svn copy URL WC' on relocated working copies
+      (r1580626, r1580650)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: blacklist building with broken versions of httpd; 2.2.25,
+      2.4.5 and 2.4.6 (r1545835)
+    * mod_dav_svn: detect out of dateness correctly during commit (issue #4480)
+
+ Developer-visible changes:
+  - General:
+    * fix libmagic detection with custom LDFLAGS (r1577200)
+    * fix a missing null byte when handling old pre-1.4 deltas (r1587968)
+    * support building with Serf 1.3.x (r1517123, r1535139)
+
+  - Bindings:
+    * javahl: fix crash from resolve callback throwing an exception (r1586439)
+
+
 Version 1.7.16
 (26 Feb 2014, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.16
@@ -266,7 +366,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix ra_serf against Subversion 1.2 servers (r1349367)
     * fix 'svn upgrade' on working copies with certain tree conflicts (r1345482)
     * avoid workqueue references to system temp dir (r1367854)
-    * allow non-existant canonical paths (r1367853)
+    * allow non-existent canonical paths (r1367853)
     * fix 'svn revert --depth files' to operate on files (r1365554)
     * fix ra_serf XML namespace handling against malicious server (r1337441)
     * fix relocate with server-relative externals (issue 4216)
@@ -618,7 +718,7 @@ the 1.6 release:  http://subversion.apac
     * fixed: rm -> ci -> cp = missing directory (issue #2763)
     * fixed: 'svn info' returns parent info on missing dirs (issue #3178)
     * fixed: spurious prop conflict with 'merge --reintegrate' (issue #3919)
-    * fixed: 'svn --version' fails with non-existant $HOME (issue #3947)
+    * fixed: 'svn --version' fails with non-existent $HOME (issue #3947)
     * fixed: unforced export silently overwites existing file (issue #3799)
     * fixed: reverse merge which adds subtree mergeinfo fails (issue #3978)
     * fixed: 'svn up -r{R>HEAD}' hangs client over ra_svn (issue #3963)
@@ -793,7 +893,7 @@ http://svn.apache.org/repos/asf/subversi
     * fix crash in mod_dav_svn with GETs of baselined resources (r1104126)
             See CVE-2011-1752, and descriptive advisory at
             http://subversion.apache.org/security/CVE-2011-1752-advisory.txt
-    * fixed: write-through proxy could direcly commit to slave (r917523)
+    * fixed: write-through proxy could directly commit to slave (r917523)
     * detect a particular corruption condition in FSFS (r1100213)
     * improve error message when clients refer to unknown revisions (r939000)
     * bugfixes and optimizations to the DAV mirroring code (r878607)

Propchange: subversion/branches/1.7.x-r1542765/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 25 21:43:57 2015
@@ -1,4 +1,5 @@
 /subversion/branches/1.5.x-r30215/CHANGES:870312
+/subversion/branches/1.7.x/CHANGES:1571486-1692664
 /subversion/branches/1.7.x-JavaHL-pools/CHANGES:1158684-1158722
 /subversion/branches/1.7.x-issue3888/CHANGES:1148937-1149162
 /subversion/branches/1.7.x-issue4087/CHANGES:1243707-1336073
@@ -64,4 +65,4 @@
 /subversion/branches/tree-conflicts/CHANGES:868291-873154
 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
 /subversion/branches/uris-as-urls/CHANGES:1060426-1064427
-/subversion/trunk/CHANGES:1145993-1485430,1485497,1485501,1485508,1503795,1503850,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1541705,1542119,1542129,1564966,1564969,1565530,1567080,1569069
+/subversion/trunk/CHANGES:1145993-1667580

Modified: subversion/branches/1.7.x-r1542765/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/NOTICE?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/NOTICE (original)
+++ subversion/branches/1.7.x-r1542765/NOTICE Sat Jul 25 21:43:57 2015
@@ -1,5 +1,5 @@
 Apache Subversion
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
 
 This product includes software developed by many people, and distributed
 under Contributor License Agreements to The Apache Software Foundation

Propchange: subversion/branches/1.7.x-r1542765/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 25 21:43:57 2015
@@ -1,5 +1,6 @@
 /subversion/1.7.x-issue4059/NOTICE:1239661-1239744
 /subversion/branches/1.5.x-r30215/NOTICE:870312
+/subversion/branches/1.7.x/NOTICE:1571486-1692664
 /subversion/branches/1.7.x-JavaHL-pools/NOTICE:1158684-1158722
 /subversion/branches/1.7.x-fsfs-commit/NOTICE:1536760-1541380
 /subversion/branches/1.7.x-gssapi-solaris10/NOTICE:1453164-1515067
@@ -74,6 +75,7 @@
 /subversion/branches/1.7.x-r1527103/NOTICE:1527110-1541378
 /subversion/branches/1.7.x-r1541790/NOTICE:1541792-1542083
 /subversion/branches/1.7.x-r1564215/NOTICE:1564280-1564618
+/subversion/branches/1.7.x-r1667941/NOTICE:1667944-1668188
 /subversion/branches/1.7.x-serf-server-root-segfaults/NOTICE:1383952-1392726
 /subversion/branches/1.7.x-svn-patch-eol-fixes/NOTICE:1207511-1235924
 /subversion/branches/atomic-revprop/NOTICE:965046-1000689
@@ -130,4 +132,4 @@
 /subversion/branches/tree-conflicts/NOTICE:868291-873154
 /subversion/branches/tree-conflicts-notify/NOTICE:873926-874008
 /subversion/branches/uris-as-urls/NOTICE:1060426-1064427
-/subversion/trunk/NOTICE:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155
 404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1
 177732,1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,121247
 6,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,129
 2296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,
 1367498,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462293,1462300,1462302,1462321,1462334,14659
 75,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1544295,1544316,1555403,1557320,1560690,1561237,1563066-1563068,1564215,1567080
+/subversion/trunk/NOTICE:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146762,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150344,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155
 404,1156085,1156098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158923-1158924,1158929,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163372,1163383,1163557,1163792,1163953,1164027,1164116,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1164929,1166267,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174342,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1
 177732,1178280,1178282,1178942,1179680,1179767,1179776,1180154,1181090,1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1186944,1186981,1186983,1187311,1187676,1187695,1188609,1188652,1188677,1188762,1188774,1189190,1189261,1189395,1189580,1189665,1190463,1195480,1197135,1197998,1199876,1199950,1200277,1200837,1200896,1201002,1201072,1201419,1201824,1202132,1202135,1202187,1202333,1202630,1202807,1203546,1203651,1203653,1203977,1204167,1204478,1204610,1204673,1205188,1205193,1205209,1205726,1205839,1205848,1205968,1206523,1206533,1206576,1206718-1206719,1206724,1206741,1206748,1207555,1207656,1207663,1207808,1207823,1207858,1207949,1208840,1209631,1209654,1210147,1210195,1210913,1211048,1211483,1211859,1211885,121247
 6,1212482,1212484,1213331,1213673,1213681,1213690,1213711,1213716,1214139,1215260,1215288,1215374-1215375,1215379,1220740,1220742,1220750,1220861,1221178,1221303,1221767,1221780,1221793,1222521,1222628,1222644,1222693,1222699,1225491,1226597,1227146,1227237,1227250,1227352,1227372,1227384-1227385,1227900,1228340,1229252,1229303,1229677,1229833,1229980,1230212,1230714,1230798,1231029,1231944-1231945,1232202,1232207,1232221-1232222,1232267,1232413,1233292,1235264,1235296,1235302,1235736,1236163,1236173,1236283,1236343,1237720,1237779,1238121,1239382,1239596,1239631,1239655,1239747,1240314,1240485,1240619,1240752,1241530,1241553,1241599,1241626,1241713,1241726,1242116,1242537,1242607,1242759,1242770,1242794,1243694,1243840,1243920,1243976,1244303,1244317,1244466,1244551,1245284-1245285,1245711,1245738,1245746,1245764,1245809,1245817,1245929,1245935,1291429,1291446,1291520,1291594,1291680,1291685,1291700,1291704,1291726,1291729,1291797,1291810,1291941,1292090,1292248,1292255,1292260,129
 2296,1292322,1292507,1292516,1292768,1292827,1292926,1293229,1293577,1293945,1293972,1293976,1293998,1294134,1294136,1294147,1294236,1294470,1294586,1295007,1295303,1295372,1295418,1296251,1296303,1296369,1296691,1297522,1298343,1300265,1302399,1302417,1302539,1302588,1302591,1302613,1305853,1306111,1306275,1306334,1307177,1309865,1309992,1310378,1310428,1310535,1310594,1311702,1311747,1311935,1325361,1327474,1327490,1327495,1327979,1328002,1328038,1328144,1328267-1328268,1328353,1328846-1328847,1328852,1328878,1329388,1329417,1329876,1330258,1330382,1330444,1330520,1335104,1335555,1337441,1338291,1338297,1338314,1338688,1338708,1338713,1338739,1338748,1338810,1339159,1339164,1340556,1341012,1341031,1341034,1341076,1341544,1341560,1342984,1344864-1344865,1344869,1345482,1345740,1346765,1348822,1349215,1349367,1349371,1349380,1349778,1351117,1351772,1352031,1352068,1353572,1354626,1354652,1354876,1354907,1355340,1361007,1361019,1361341,1362508,1365519,1365549,1365554,1365556,1365592,
 1367498,1368065,1368128,1368197-1368198,1371282,1374198,1374800,1374802,1375052,1375089,1376414,1378847,1380175,1380295,1380697,1382843,1383029,1383466,1383483,1383946,1387226,1387943,1388975,1389364,1389499,1389658,1389851,1389878,1389928,1390653,1390965,1391020,1391022,1391641,1391935,1392502,1392599,1393061,1393156,1393165,1393542,1393551,1393598,1394519,1396285,1398100,1399174,1401915,1402417,1402421,1403258,1403583,1403588,1403691,1403964,1403982,1404912,1405922,1407131,1407812,1408650,1409146,1409939,1410106,1410203,1413402,1419670-1419681,1421011,1421103,1421380,1421541,1422053,1422100,1423585,1423646,1423837,1423840,1423848,1424977,1425368,1426138,1426264,1426752,1426830,1427197,1427210,1427278,1429201,1434128,1434405,1434414,1434418,1434435,1434476,1434750,1435361,1438602,1438683,1441810,1443763,1443929,1445753,1451678,1452617,1452780,1452967,1453780,1454088,1454217,1455352,1458341,1459599,1461278,1461562,1461580,1461701,1461743,1462293,1462300,1462302,1462321,1462334,14659
 75,1476359,1477730,1481010,1481627,1482282,1483781,1485350,1490684,1503528,1507044,1512432,1512471-1512472,1513463,1513472,1514763,1515119,1515237,1515992,1515997,1516023-1516024,1516051-1516052,1516565,1516806,1518184,1520529,1520532,1520539,1522892,1524869,1527103,1527105,1535551,1535591,1537360,1537415,1537555,1537700,1539309,1541705,1541790,1542042,1542069,1542071,1542119,1542129,1544295,1544316,1555403,1557320,1560690,1561237,1563066-1563068,1564215,1567080,1667976

Modified: subversion/branches/1.7.x-r1542765/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/STATUS?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/STATUS (original)
+++ subversion/branches/1.7.x-r1542765/STATUS Sat Jul 25 21:43:57 2015
@@ -10,7 +10,7 @@ See http://subversion.apache.org/docs/co
 for details on how release lines and voting work, what kinds of bugs can
 delay a release, etc.
 
-Status of 1.7.17:
+Status of 1.7.21:
 
 Candidate changes:
 ==================
@@ -52,47 +52,58 @@ Candidate changes:
      -0: danielsh (restrictions not suitable for introduction in patch release;
                    dev@ thread started 2013/05/10 9pm)
 
- * r1542610, r1564576, r1568180
-   Add missing description to build.conf, to properly generate a version
-   resource (including icon) for this executable on Windows.
-   Votes:
-     +1 (without r1568180): breser
-     +1: rhuijben
-
- * ^/subversion/branches/1.7.x-serf-1.3.x-Windows
-   Allow compiling against Serf 1.3.x
-   Notes:
-     Backport of the 1.8 fixes, plus a few more fixes in order not to
-     break the neon compilation which also hooks into zlib.
+ * r1654932, r1654933, r1654934, r1654937
+   Fix issue #4554, "0 file length reported in FSFS".
    Justification:
-     (Without this patch the Windows buildbot remains broken for serf with 1.7,
-      as recent Subversion versions require serf 1.3.x)
+     We want 1.7 to cope with repositories that have been touched by 1.8.
+     The issue causes 'svnadmin dump' to create corrupted output that fails
+     to load and we provide no way to detect that problem other than loading
+     the respective dump.  We also want to prevent further instances of that
+     issue to be added to the repository.
+   Branch:
+     ^/subversion/branches/1.7.x-issue4554
    Votes:
-     +1: rhuijben, jcorvel
+     +1: stefan2, brane
 
- * ^/subversion/branches/1.7.x-r1551579
-   Fix moving files from externals to ancestor directories and vice versa.
+ * r1659867
+   Make editor-aborts after close edit safe.
    Justification:
-     "Moves should just work" or "be nice to api users, like Markus"
+     A SIGPIPE caused by cancelling a commit at the wrong time may cause
+     the commit editor to return an error from editor->close_edit() which
+     makes most code paths call editor->abort_edit(), causing a double
+     free() of the txnroot pool.  This branch contains
+     the 1.7.x equivalent of the 1.8.x and trunk patch including a similar
+     fix for ra-neon.
+   Branch:
+     ^/subversion/branches/1.7.x-r1659867
    Votes:
-     +1: rhuijben, breser
-     +1 (non-binding): schabi (Fixes our use case, all our other tests pass.)
+     +1: rhuijben, brane
+     +1: danielsh (libsvn_repos part only)
 
- * r1555491
-   Fix svn_fs_close_root for FSFS transaction roots.
+ * ^/subversion/branches/1.7.x-VS2015
+   Fix compilation with VS2015 when ruby is found
    Justification:
-     Without this patch, cache-related pool cleanups may be run after the
-     svn_fs_t object has been destroyed.  I.e. even with explicit calls to
-     svn_fs_close_root, the user may see a segfault.
-   Branch:
-     ^/subversion/branches/1.7.x-r1555491
+     Avoid overriding 'snprintf' on Visual Studio version(s) that define
+     this function directly, avoids compilation errors.
    Votes:
-     +1: stefan2, breser
-     -0: rhuijben (Seems to be a different name for the same pool. See 1.8?)
+     +1: rhuijben.
 
 Veto-blocked changes:
 =====================
 
+ * r1542765, r1571214
+   Add Sqlite index information.
+   Justification:
+     Adding this information explains to Sqlite how we use our indexes. While
+     Subversion 1.7 doesn't depend on this as much as 1.8 as we didn't tune the
+     queries as much at that time, this information will make several queries
+     use indexes instead of table scans.
+   Branch:
+     ^/subversion/branches/1.7.x-r1542765
+   Votes:
+     +1: rhuijben, stefan2, brane
+     -1: brane (breaks working copy with SQLite 3.7.5)
+
  * r1409804
    Add a delimiter between the two chains in svn_error_compose_create().
    Justification:
@@ -105,4 +116,38 @@ Veto-blocked changes:
                    this is about err->message which is valid in all builds)
      -1: stsp (not a bug fix, changes output in a patch release)
 
+
+ * r1646230, r1646250, r1646253, r1656893, r1657182, r1657195, r1657401
+   Make svnsync strip any r0 references from mergeinfo -- issue #4476.
+   Justification:
+     Without this is was not possible to svnsync a repository that contained
+     this kind of mergeinfo that is now considered invalid but previously
+     could be committed.
+   Branch:
+     ^/subversion/branches/1.7.x-r1646250
+   Notes:
+     r1643074 (nominated separately) is required for the test to work.
+     I would recommend not backporting r1646250 without r1643074.
+     This is also nominated for 1.8.x.
+   Votes:
+     -1: julianfoad (the test is failing; not essential for 1.7.x)
+
+* r1643074
+   Don't let invalid mergeinfo stop 'svnadmin load' from working.
+     Part of issue #4476 "Mergeinfo containing r0 makes svnsync and svnadmin
+     dump fail".
+   Justification:
+     The presence of 'bad' metadata in a repository should not prevent
+     backing up and restoring from a backup, given that this data does not
+     make the repository totally unusable.
+   Notes:
+     The 'svnadmin dump' part of this issue is already approved for backport.
+     The 'svnsync' part of this issue is not yet fixed.
+   Branch:
+     ^/subversion/branches/1.7.x-r1643074
+   Votes:
+     -1: julianfoad (I think the fix is right but the branch doesn't merge
+           properly with a plain automatic merge)
+
 Approved changes:
+=================

Modified: subversion/branches/1.7.x-r1542765/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/autogen.sh?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/autogen.sh (original)
+++ subversion/branches/1.7.x-r1542765/autogen.sh Sat Jul 25 21:43:57 2015
@@ -23,6 +23,10 @@
 ### Run this to produce everything needed for configuration. ###
 
 
+# Some shells can produce output when running 'cd' which interferes
+# with the construct 'abs=`cd dir && pwd`'.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 # Run tests to ensure that our build requirements are met
 RELEASE_MODE=""
 RELEASE_ARGS=""
@@ -71,48 +75,80 @@ rm -f build/config.guess build/config.su
 $libtoolize --copy --automake --force
 
 ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
 
-if [ ! -f $ltfile ]; then
-    echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+if [ "x$LIBTOOL_M4" = "x" ]; then
+    ltm4_error='(try setting the LIBTOOL_M4 environment variable)'
+    if [ -d "$ltpath/../share/aclocal/." ]; then
+        ltm4=`cd "$ltpath/../share/aclocal" && pwd`
+    else
+        echo "Libtool helper path not found $ltm4_error"
+        echo "  expected at: '$ltpath/../share/aclocal'"
+        exit 1
+    fi
+else
+    ltm4_error="(the LIBTOOL_M4 environment variable is: $LIBTOOL_M4)"
+    ltm4="$LIBTOOL_M4"
+fi
+
+ltfile="$ltm4/libtool.m4"
+if [ ! -f "$ltfile" ]; then
+    echo "$ltfile not found $ltm4_error"
     exit 1
 fi
 
-echo "Copying libtool helper: $ltfile"
+echo "Copying libtool helper:  $ltfile"
 # An ancient helper might already be present from previous builds,
 # and it might be write-protected (e.g. mode 444, seen on FreeBSD).
 # This would cause cp to fail and print an error message, but leave
 # behind a potentially outdated libtool helper.  So, remove before
 # copying:
 rm -f build/libtool.m4
-cp $ltfile build/libtool.m4
+cp "$ltfile" build/libtool.m4
 
 for file in ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4; do
     rm -f build/$file
 
     if [ $lt_major_version -ge 2 ]; then
-        ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+        ltfile="$ltm4/$file"
 
-        if [ ! -f $ltfile ]; then
-            echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
+        if [ ! -f "$ltfile" ]; then
+            echo "$ltfile not found $ltm4_error"
             exit 1
         fi
 
-        echo "Copying libtool helper: $ltfile"
-        cp $ltfile build/$file
+        echo "Copying libtool helper:  $ltfile"
+        cp "$ltfile" "build/$file"
     fi
 done
 
 if [ $lt_major_version -ge 2 ]; then
+    if [ "x$LIBTOOL_CONFIG" = "x" ]; then
+        ltconfig_error='(try setting the LIBTOOL_CONFIG environment variable)'
+        if [ -d "$ltpath/../share/libtool/config/." ]; then
+            ltconfig=`cd "$ltpath/../share/libtool/config" && pwd`
+        elif [ -d "$ltpath/../share/libtool/build-aux/." ]; then
+            ltconfig=`cd "$ltpath/../share/libtool/build-aux" && pwd`
+        else
+            echo "Autoconf helper path not found $ltconfig_error"
+            echo "  expected at: '$ltpath/../share/libtool/config'"
+            echo "           or: '$ltpath/../share/libtool/build-aux'"
+            exit 1
+        fi
+    else
+        ltconfig_error="(the LIBTOOL_CONFIG environment variable is: $LIBTOOL_CONFIG)"
+        ltconfig="$LIBTOOL_CONFIG"
+    fi
+
     for file in config.guess config.sub; do
-        configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ; pwd`/$file}
+        configfile="$ltconfig/$file"
 
-        if [ ! -f $configfile ]; then
-            echo "$configfile not found (try setting the LIBTOOL_CONFIG environment variable)"
+        if [ ! -f "$configfile" ]; then
+            echo "$configfile not found $ltconfig_error"
             exit 1
         fi
 
-	cp $configfile build/$file
+        echo "Copying autoconf helper: $configfile"
+	cp "$configfile" build/$file
     done
 fi
 

Modified: subversion/branches/1.7.x-r1542765/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build.conf?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build.conf (original)
+++ subversion/branches/1.7.x-r1542765/build.conf Sat Jul 25 21:43:57 2015
@@ -331,6 +331,7 @@ msvc-export =
         private\svn_token.h  private\svn_adler32.h
         private\svn_temp_serializer.h private\svn_io_private.h
         private\svn_string_private.h private\svn_magic.h
+        private\svn_cert.h
 
 # Working copy management lib
 [libsvn_wc]
@@ -1223,6 +1224,7 @@ install = tools
 libs = libsvn_repos libsvn_subr apr
 
 [svn-populate-node-origins-index]
+description = Tool to populate the node origins index of a repository
 type = exe
 path = tools/server-side
 sources = svn-populate-node-origins-index.c

Modified: subversion/branches/1.7.x-r1542765/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/ac-macros/apache.m4?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.7.x-r1542765/build/ac-macros/apache.m4 Sat Jul 25 21:43:57 2015
@@ -118,6 +118,27 @@ apache_minor_version=AP_SERVER_MINORVERS
   CPPFLAGS="$old_CPPFLAGS"
 fi
 
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+  AC_MSG_CHECKING([mod_dav version])
+  old_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+  blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
+  AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
+               [
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION],
+               [AC_MSG_RESULT([broken])
+                AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
+               [AC_MSG_RESULT([acceptable])])
+  CPPFLAGS="$old_CPPFLAGS"
+fi
+
 AC_ARG_WITH(apache-libexecdir,
             [AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
                             [Install Apache modules to PATH instead of Apache's

Modified: subversion/branches/1.7.x-r1542765/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/ac-macros/berkeley-db.m4?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/1.7.x-r1542765/build/ac-macros/berkeley-db.m4 Sat Jul 25 21:43:57 2015
@@ -89,7 +89,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
         done
         SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
         for l in [`echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`]; do
-          LDFLAGS="$LDFLAGS -L$l"
+          LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$l)`"
         done
         SVN_DB_LIBS=""
         for l in [`echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`]; do

Modified: subversion/branches/1.7.x-r1542765/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/ac-macros/serf.m4?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/ac-macros/serf.m4 (original)
+++ subversion/branches/1.7.x-r1542765/build/ac-macros/serf.m4 Sat Jul 25 21:43:57 2015
@@ -85,7 +85,7 @@ AC_DEFUN(SVN_LIB_SERF,
       SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
     else
       SVN_SERF_LIBS="-l$serf_major"
-      LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+      LDFLAGS="$LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS(-L$serf_prefix/lib)`"
     fi
   elif test $serf_found = "reconfig"; then
     serf_found=yes

Modified: subversion/branches/1.7.x-r1542765/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/gen_vcnet_vcproj.py?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/gen_vcnet_vcproj.py Sat Jul 25 21:43:57 2015
@@ -115,6 +115,7 @@ class Generator(gen_win.WinGeneratorBase
       'instrument_apr_pools' : self.instrument_apr_pools,
       'instrument_purify_quantify' : self.instrument_purify_quantify,
       'version' : self.vcproj_version,
+      'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
       }
 
     if self.vcproj_extension == '.vcproj':
@@ -201,6 +202,8 @@ class Generator(gen_win.WinGeneratorBase
       for i in range(len(depends)):
         if depends[i].fname.startswith(self.projfilesdir):
           path = depends[i].fname[len(self.projfilesdir) + 1:]
+        elif os.path.isabs(depends[i].fname):
+          path = depends[i].fname
         else:
           path = '$(SolutionDir)' + depends[i].fname
         deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],

Modified: subversion/branches/1.7.x-r1542765/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/gen_win.py?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/gen_win.py (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/gen_win.py Sat Jul 25 21:43:57 2015
@@ -188,6 +188,26 @@ class GeneratorBase(gen_base.GeneratorBa
           self.sln_version = '11.00'
           self.vcproj_version = '10.0'
           self.vcproj_extension = '.vcxproj'
+        elif val == '2010':
+          self.vs_version = '2010'
+          self.sln_version = '11.00'
+          self.vcproj_version = '10.0'
+          self.vcproj_extension = '.vcxproj'
+        elif val == '2012' or val == '11':
+          self.vs_version = '2012'
+          self.sln_version = '12.00'
+          self.vcproj_version = '11.0'
+          self.vcproj_extension = '.vcxproj'
+        elif val == '2013' or val == '12':
+          self.vs_version = '2013'
+          self.sln_version = '12.00'
+          self.vcproj_version = '12.0'
+          self.vcproj_extension = '.vcxproj'
+        elif val == '2015' or val == '14':
+          self.vs_version = '2015'
+          self.sln_version = '12.00'
+          self.vcproj_version = '14.0'
+          self.vcproj_extension = '.vcxproj'
         else:
           print('WARNING: Unknown VS.NET version "%s",'
                  ' assuming "%s"\n' % (val, '7.00'))
@@ -382,14 +402,21 @@ class WinGeneratorBase(GeneratorBase):
       install_targets = [x for x in install_targets if not (isinstance(x, gen_base.TargetExe)
                                                             and x.install == 'bdb-test')]
 
+    # Don't build serf when we don't have it or for 1.3+
+    if not self.serf_lib or (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+      install_targets = [x for x in install_targets if x.name != 'serf']      
+      
     # Drop the serf target if we don't have both serf and openssl
     if not self.serf_lib:
-      install_targets = [x for x in install_targets if x.name != 'serf']
       install_targets = [x for x in install_targets if x.name != 'libsvn_ra_serf']
     if self.without_neon:
       install_targets = [x for x in install_targets if x.name != 'neon']
       install_targets = [x for x in install_targets if x.name != 'libsvn_ra_neon']
 
+    # Don't build zlib if we have an already compiled serf
+    if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+      install_targets = [x for x in install_targets if x.name != 'zlib']
+
     # Drop the swig targets if we don't have swig
     if not self.swig_path and not self.swig_libdir:
       install_targets = [x for x in install_targets
@@ -712,7 +739,9 @@ class WinGeneratorBase(GeneratorBase):
 
     # Build ZLib as a dependency of Neon or Serf if we have it
     if self.zlib_path and (name == 'neon' or name == 'serf'):
-      depends.extend(self.sections['zlib'].get_targets())
+      # Don't add a dependency to zlib, when we don't build zlib.
+      if not self.serf_lib or (self.serf_ver_maj, self.serf_ver_min) < (1, 3):
+        depends.extend(self.sections['zlib'].get_targets())
 
     # To set the correct build order of the JavaHL targets, the javahl-javah
     # and libsvnjavahl targets are defined with extra dependencies in build.conf
@@ -942,6 +971,9 @@ class WinGeneratorBase(GeneratorBase):
 
     if self.serf_lib:
       fakeincludes.append(self.apath(self.serf_path))
+      
+      if self.openssl_path and self.openssl_inc_dir:
+        fakeincludes.append(self.apath(self.openssl_inc_dir))
 
     if self.swig_libdir \
        and (isinstance(target, gen_base.TargetSWIG)
@@ -993,7 +1025,13 @@ class WinGeneratorBase(GeneratorBase):
     if self.sasl_path:
       fakelibdirs.append(self.apath(self.sasl_path, "lib"))
     if self.serf_lib:
-      fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
+      if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+        fakelibdirs.append(self.apath(self.serf_path))
+        
+        if self.openssl_path and self.openssl_lib_dir:
+          fakelibdirs.append(self.apath(self.openssl_lib_dir))
+      else:
+        fakelibdirs.append(self.apath(msvc_path_join(self.serf_path, cfg)))
 
     fakelibdirs.append(self.apath(self.apr_path, cfg))
     fakelibdirs.append(self.apath(self.apr_util_path, cfg))
@@ -1033,7 +1071,14 @@ class WinGeneratorBase(GeneratorBase):
       else:
         serflib = 'serf.lib'
 
-    zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+    if self.serf_lib and (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+      # We don't build zlib ourselves, so use the standard name
+      # (zdll.lib would link to zlib.dll)
+      zlib = 'zlib.lib'
+    else:
+      # We compile zlib ourselves to these explicit (non-standard) names
+      zlib = (cfg == 'Debug' and 'zlibstatD.lib' or 'zlibstat.lib')
+      
     sasllib = None
     if self.sasl_path:
       sasllib = 'libsasl.lib'
@@ -1080,6 +1125,9 @@ class WinGeneratorBase(GeneratorBase):
 
       if self.serf_lib and dep.external_lib == '$(SVN_SERF_LIBS)':
         nondeplibs.append(serflib)
+        if (self.serf_ver_maj, self.serf_ver_min) >= (1, 3):
+          nondeplibs.append('ssleay32.lib')
+          nondeplibs.append('libeay32.lib')
 
       if dep.external_lib == '$(SVN_SASL_LIBS)':
         nondeplibs.append(sasllib)
@@ -1225,7 +1273,8 @@ class WinGeneratorBase(GeneratorBase):
     data = {
       'version' : self.vcproj_version,
       'configs' : self.configs,
-      'platforms' : self.platforms
+      'platforms' : self.platforms,
+      'toolset_version' : 'v' + self.vcproj_version.replace('.',''),
       }
     for key, val in params:
       data[key] = val
@@ -1487,6 +1536,21 @@ class WinGeneratorBase(GeneratorBase):
     "Check if serf and its dependencies are available"
 
     minimal_serf_version = (0, 3, 0)
+    
+    if self.openssl_path and os.path.exists(self.openssl_path):
+      version_path = os.path.join(self.openssl_path, 'inc32/openssl/opensslv.h')
+      if os.path.isfile(version_path):
+        # We have an OpenSSL Source location (legacy handling)
+        self.openssl_inc_dir = os.path.join(self.openssl_path, 'inc32')
+        self.openssl_lib_dir = os.path.join(self.openssl_path, 'out32dll')
+      elif os.path.isfile(os.path.join(self.openssl_path,
+                          'include/openssl/opensslv.h')):
+        self.openssl_inc_dir = os.path.join(self.openssl_path, 'include')
+        self.openssl_lib_dir = os.path.join(self.openssl_path, 'lib')
+      else:
+        print('WARNING: \'opensslv.h\' not found')
+        self.openssl_path = None
+    
     self.serf_lib = None
     if self.serf_path and os.path.exists(self.serf_path):
       if self.openssl_path and os.path.exists(self.openssl_path):

Modified: subversion/branches/1.7.x-r1542765/build/generator/templates/build_zlib.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/templates/build_zlib.ezt?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/templates/build_zlib.ezt (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/templates/build_zlib.ezt Sat Jul 25 21:43:57 2015
@@ -44,25 +44,6 @@ if /i "%2" == "x64" goto PX64
 goto pIIerr
 
 :checkrebuild
-
-[if-any use_ml]
-@rem **************************************************************************
-@rem Compile ASM sources with ML
-set ASFLAGS=-nologo -Zi -coff
-set LOC=-DASMV -DASMINF
-[is zlib_version "1.2.4"]
-set OBJA=contrib\masmx86\gvmat32c.obj contrib\masmx86\gvmat32.obj contrib\masmx86\inffas32.obj
-set ASM_OPTS=ASFLAGS="%ASFLAGS%" LOC="%LOC%" OBJA="%OBJA%"
-[else]
-if /i "%2" == "Win32" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj"
-) else if /i "%2" == "x64" (
-  set ASM_OPTS=LOC="-DASMV -DASMINF" OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" AS=ml64 
-)
-[end]
-[end]
-
-
 if /i "%3" == "rebuild" goto rebuild
 if /i "%3" == "clean" goto clean
 if not "%3" == "" goto pIIIerr

Modified: subversion/branches/1.7.x-r1542765/build/generator/templates/svn_config.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/templates/svn_config.vcxproj.ezt?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/templates/svn_config.vcxproj.ezt (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/templates/svn_config.vcxproj.ezt Sat Jul 25 21:43:57 2015
@@ -33,6 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcproj.ezt?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcproj.ezt (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcproj.ezt Sat Jul 25 21:43:57 2015
@@ -32,7 +32,7 @@
 			Name="[configs.name]|[platforms]"
 			OutputDirectory="..\..\..\[configs.name]\[target.output_dir]"
 			BuildLogFile="$(IntDir)\BuildLog_$(ProjectName).htm"
-			IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]"
+			IntermediateDirectory="..\..\..\[configs.name]\[target.intermediate_dir]\[target.proj_name]"
 			ConfigurationType="[target_type]"[is configs.name "Release"]
 			WholeProgramOptimization="FALSE"[end]>
 			<Tool

Modified: subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcxproj.ezt?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcxproj.ezt (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/templates/vcnet_vcxproj.ezt Sat Jul 25 21:43:57 2015
@@ -33,6 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs.name]|[platforms]'" Label="Configuration">
     <ConfigurationType>[config_type]</ConfigurationType>
     <UseDebugLibraries>[is configs.name "Debug"]true[else]false[end]</UseDebugLibraries>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/1.7.x-r1542765/build/generator/templates/zlib.vcxproj.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/build/generator/templates/zlib.vcxproj.ezt?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/build/generator/templates/zlib.vcxproj.ezt (original)
+++ subversion/branches/1.7.x-r1542765/build/generator/templates/zlib.vcxproj.ezt Sat Jul 25 21:43:57 2015
@@ -33,6 +33,7 @@
 [for platforms][for configs]  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='[configs]|[platforms]'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseDebugLibraries>[is configs "Debug"]true[else]false[end]</UseDebugLibraries>
+    <PlatformToolset>[toolset_version]</PlatformToolset>
   </PropertyGroup>
 [end][end]  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: subversion/branches/1.7.x-r1542765/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/configure.ac?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/configure.ac (original)
+++ subversion/branches/1.7.x-r1542765/configure.ac Sat Jul 25 21:43:57 2015
@@ -721,7 +721,7 @@ AC_ARG_WITH(libmagic,AS_HELP_STRING([--w
     CPPFLAGS="$CPPFLAGS -I$libmagic_prefix/include"
     AC_CHECK_HEADERS(magic.h,[
       save_ldflags="$LDFLAGS"
-      LDFLAGS="-L$libmagic_prefix/lib"
+      LDFLAGS="-L$libmagic_prefix/lib $LDFLAGS"
       AC_CHECK_LIB(magic, magic_open, [libmagic_found="yes"])
       LDFLAGS="$save_ldflags"
     ])

Modified: subversion/branches/1.7.x-r1542765/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/gen-make.py?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/gen-make.py (original)
+++ subversion/branches/1.7.x-r1542765/gen-make.py Sat Jul 25 21:43:57 2015
@@ -211,8 +211,8 @@ def _usage_exit(err=None):
   print("           Use static apr and apr-util")
   print("")
   print("  --vsnet-version=VER")
-  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008 or 2010)")
-  print("           [only valid in combination with '-t vcproj']")
+  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008, 2010,")
+  print("           2012, 2013 or 2015) [only valid in combination with '-t vcproj']")
   print("")
   print("  --with-apr_memcache=DIR")
   print("           the apr_memcache sources are in DIR")

Modified: subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/ClientContext.cpp?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/ClientContext.cpp Sat Jul 25 21:43:57 2015
@@ -422,6 +422,7 @@ ClientContext::resolve(svn_wc_conflict_r
 {
   jobject jctx = (jobject) baton;
   JNIEnv *env = JNIUtil::getEnv();
+  *result = NULL;
 
   // Create a local frame for our references
   env->PushLocalFrame(LOCAL_FRAME_SIZE);

Modified: subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.cpp Sat Jul 25 21:43:57 2015
@@ -399,7 +399,7 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
   env->DeleteLocalRef(jfileName);
 }
 
-void JNIUtil::handleSVNError(svn_error_t *err)
+void JNIUtil::wrappedHandleSVNError(svn_error_t *err)
 {
   std::string msg;
   assembleErrorMessage(svn_error_purge_tracing(err), 0, APR_SUCCESS, msg);
@@ -521,7 +521,16 @@ void JNIUtil::handleSVNError(svn_error_t
 #endif
 
   env->Throw(static_cast<jthrowable>(env->PopLocalFrame(nativeException)));
+}
 
+void JNIUtil::handleSVNError(svn_error_t *err)
+{
+  try {
+    wrappedHandleSVNError(err);
+  } catch (...) {
+    svn_error_clear(err);
+    throw;
+  }
   svn_error_clear(err);
 }
 
@@ -621,28 +630,42 @@ bool JNIUtil::isJavaExceptionThrown()
 const char *
 JNIUtil::thrownExceptionToCString(SVN::Pool &in_pool)
 {
-  const char *msg;
+  const char *msg = NULL;
   JNIEnv *env = getEnv();
+  apr_pool_t *pool = in_pool.getPool();
   if (env->ExceptionCheck())
     {
       jthrowable t = env->ExceptionOccurred();
-      static jmethodID getMessage = 0;
-      if (getMessage == 0)
+      jclass cls = env->GetObjectClass(t);
+
+      jstring jclass_name;
+      {
+        jmethodID mid = env->GetMethodID(cls, "getClass", "()Ljava/lang/Class;");
+        jobject clsobj = env->CallObjectMethod(t, mid);
+        jclass basecls = env->GetObjectClass(clsobj);
+        mid = env->GetMethodID(basecls, "getName", "()Ljava/lang/String;");
+        jclass_name = (jstring) env->CallObjectMethod(clsobj, mid);
+      }
+
+      jstring jmessage;
+      {
+        jmethodID mid = env->GetMethodID(cls, "getMessage",
+                                         "()Ljava/lang/String;");
+        jmessage = (jstring) env->CallObjectMethod(t, mid);
+      }
+
+      JNIStringHolder class_name(jclass_name);
+      if (jmessage)
         {
-          jclass clazz = env->FindClass("java/lang/Throwable");
-          getMessage = env->GetMethodID(clazz, "getMessage",
-                                        "(V)Ljava/lang/String;");
-          env->DeleteLocalRef(clazz);
+          JNIStringHolder message(jmessage);
+          msg = apr_pstrcat(pool,
+                            static_cast<const char*>(class_name), ": ",
+                            static_cast<const char*>(message), NULL);
         }
-      jstring jmsg = (jstring) env->CallObjectMethod(t, getMessage);
-      JNIStringHolder tmp(jmsg);
-      msg = tmp.pstrdup(in_pool.getPool());
+      else
+        msg = class_name.pstrdup(pool);
       // ### Conditionally add t.printStackTrace() to msg?
     }
-  else
-    {
-      msg = NULL;
-    }
   return msg;
 }
 

Modified: subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.h?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/branches/1.7.x-r1542765/subversion/bindings/javahl/native/JNIUtil.h Sat Jul 25 21:43:57 2015
@@ -138,6 +138,7 @@ class JNIUtil
   enum { noLog, errorLog, exceptionLog, entryLog } LogLevel;
 
  private:
+  static void wrappedHandleSVNError(svn_error_t *err);
   static void assembleErrorMessage(svn_error_t *err, int depth,
                                    apr_status_t parent_apr_err,
                                    std::string &buffer);

Modified: subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/apr.swg
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/apr.swg?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/apr.swg (original)
+++ subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/apr.swg Sat Jul 25 21:43:57 2015
@@ -31,23 +31,21 @@
 */
 #ifdef SWIGPERL
 %typemap(out) long long {
-    char temp[256];
+    char temp[30];
     sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t) $1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++), temp);
+    %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
 
 %typemap(out) unsigned long long {
-    char temp[256];
+    char temp[30];
     sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t) $1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++), temp);
+    %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
 
 %typemap(in, numinputs=0) long long *OUTPUT (apr_int64_t temp)
     "$1 = &temp;";
 %typemap(argout) long long *OUTPUT {
-  char temp[256];
+  char temp[30];
   sprintf(temp, "%" APR_INT64_T_FMT, (apr_int64_t)*($1));
   %append_output(sv_2mortal(newSVpv(temp, 0)));
 }
@@ -55,7 +53,7 @@
 %typemap(in, numinputs=0) unsigned long long *OUTPUT (apr_uint64_t temp)
     "$1 = &temp;";
 %typemap(argout) unsigned long long *OUTPUT {
-  char temp[256];
+  char temp[30];
   sprintf(temp, "%" APR_UINT64_T_FMT, (apr_uint64_t)*($1));
   %append_output(sv_2mortal(newSVpv(temp, 0)));
 }

Modified: subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/svn_types.swg?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/branches/1.7.x-r1542765/subversion/bindings/swig/include/svn_types.swg Sat Jul 25 21:43:57 2015
@@ -1102,11 +1102,7 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
 }
 
 %typemap(argout) unsigned char *result_digest {
-  /* FIXME: This code is clearly buggy. The return value of sv_newmortal()
-     is immediately overwritten by the return value
-     of svn_swig_pl_from_md5(). */
-    ST(argvi) = sv_newmortal();
-    ST(argvi++) = svn_swig_pl_from_md5($1);
+    %append_output(svn_swig_pl_from_md5($1));
 }
 #endif
 

Modified: subversion/branches/1.7.x-r1542765/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/include/svn_io.h?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/include/svn_io.h (original)
+++ subversion/branches/1.7.x-r1542765/subversion/include/svn_io.h Sat Jul 25 21:43:57 2015
@@ -1064,6 +1064,8 @@ svn_stream_read(svn_stream_t *stream,
  * of reads or a simple seek operation. If the stream implementation has
  * not provided a skip function, this will read from the stream and
  * discard the data.
+ *
+ * @since New in 1.7.
  */
 svn_error_t *
 svn_stream_skip(svn_stream_t *stream,

Modified: subversion/branches/1.7.x-r1542765/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/include/svn_version.h?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/include/svn_version.h (original)
+++ subversion/branches/1.7.x-r1542765/subversion/include/svn_version.h Sat Jul 25 21:43:57 2015
@@ -71,7 +71,7 @@ extern "C" {
  *
  * @since New in 1.1.
  */
-#define SVN_VER_PATCH      17
+#define SVN_VER_PATCH      21
 
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */

Modified: subversion/branches/1.7.x-r1542765/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1542765/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1692665&r1=1692664&r2=1692665&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1542765/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (original)
+++ subversion/branches/1.7.x-r1542765/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Sat Jul 25 21:43:57 2015
@@ -28,6 +28,7 @@
 /*** Includes. ***/
 
 #include <apr_pools.h>
+#include <apr_strings.h>
 #include "svn_auth.h"
 #include "svn_config.h"
 #include "svn_error.h"
@@ -46,120 +47,19 @@
 /*-----------------------------------------------------------------------*/
 
 
-struct gnome_keyring_baton
-{
-  const char *keyring_name;
-  GnomeKeyringInfo *info;
-  GMainLoop *loop;
-};
-
-
-/* Callback function to destroy gnome_keyring_baton. */
-static void
-callback_destroy_data_keyring(void *data)
-{
-  struct gnome_keyring_baton *key_info = data;
-
-  if (data == NULL)
-    return;
-
-  free((void*)key_info->keyring_name);
-  key_info->keyring_name = NULL;
-
-  if (key_info->info)
-    {
-      gnome_keyring_info_free(key_info->info);
-      key_info->info = NULL;
-    }
-
-  return;
-}
-
-
-/* Callback function to complete the keyring operation. */
-static void
-callback_done(GnomeKeyringResult result,
-              gpointer data)
-{
-  struct gnome_keyring_baton *key_info = data;
-
-  g_main_loop_quit(key_info->loop);
-  return;
-}
-
-
-/* Callback function to get the keyring info. */
-static void
-callback_get_info_keyring(GnomeKeyringResult result,
-                          GnomeKeyringInfo *info,
-                          void *data)
-{
-  struct gnome_keyring_baton *key_info = data;
-
-  if (result == GNOME_KEYRING_RESULT_OK && info != NULL)
-    {
-      key_info->info = gnome_keyring_info_copy(info);
-    }
-  else
-    {
-      if (key_info->info != NULL)
-        gnome_keyring_info_free(key_info->info);
-
-      key_info->info = NULL;
-    }
-
-  g_main_loop_quit(key_info->loop);
-
-  return;
-}
-
-
-/* Callback function to get the default keyring string name. */
-static void
-callback_default_keyring(GnomeKeyringResult result,
-                         const char *string,
-                         void *data)
-{
-  struct gnome_keyring_baton *key_info = data;
-
-  if (result == GNOME_KEYRING_RESULT_OK && string != NULL)
-    {
-      key_info->keyring_name = strdup(string);
-    }
-  else
-    {
-      free((void*)key_info->keyring_name);
-      key_info->keyring_name = NULL;
-    }
-
-  g_main_loop_quit(key_info->loop);
-
-  return;
-}
-
-/* Returns the default keyring name. */
+/* Returns the default keyring name, allocated in RESULT_POOL. */
 static char*
-get_default_keyring_name(apr_pool_t *pool)
+get_default_keyring_name(apr_pool_t *result_pool)
 {
-  char *def = NULL;
-  struct gnome_keyring_baton key_info;
-
-  key_info.info = NULL;
-  key_info.keyring_name = NULL;
+  char *name, *def;
+  GnomeKeyringResult gkr;
 
-  /* Finds default keyring. */
-  key_info.loop = g_main_loop_new(NULL, FALSE);
-  gnome_keyring_get_default_keyring(callback_default_keyring, &key_info, NULL);
-  g_main_loop_run(key_info.loop);
-
-  if (key_info.keyring_name == NULL)
-    {
-      callback_destroy_data_keyring(&key_info);
-      return NULL;
-    }
+  gkr = gnome_keyring_get_default_keyring_sync(&name);
+  if (gkr != GNOME_KEYRING_RESULT_OK)
+    return NULL;
 
-  def = strdup(key_info.keyring_name);
-  callback_destroy_data_keyring(&key_info);
+  def = apr_pstrdup(result_pool, name);
+  g_free(name);
 
   return def;
 }
@@ -168,28 +68,22 @@ get_default_keyring_name(apr_pool_t *poo
 static svn_boolean_t
 check_keyring_is_locked(const char *keyring_name)
 {
-  struct gnome_keyring_baton key_info;
+  GnomeKeyringInfo *info;
+  svn_boolean_t locked;
+  GnomeKeyringResult gkr;
 
-  key_info.info = NULL;
-  key_info.keyring_name = NULL;
+  gkr = gnome_keyring_get_info_sync(keyring_name, &info);
+  if (gkr != GNOME_KEYRING_RESULT_OK)
+    return FALSE;
 
-  /* Get details about the default keyring. */
-  key_info.loop = g_main_loop_new(NULL, FALSE);
-  gnome_keyring_get_info(keyring_name, callback_get_info_keyring, &key_info,
-                         NULL);
-  g_main_loop_run(key_info.loop);
-
-  if (key_info.info == NULL)
-    {
-      callback_destroy_data_keyring(&key_info);
-      return FALSE;
-    }
-
-  /* Check if keyring is locked. */
-  if (gnome_keyring_info_get_is_locked(key_info.info))
-    return TRUE;
+  if (gnome_keyring_info_get_is_locked(info))
+    locked = TRUE;
   else
-    return FALSE;
+    locked = FALSE;
+
+  gnome_keyring_info_free(info);
+
+  return locked;
 }
 
 /* Unlock the KEYRING_NAME with the KEYRING_PASSWORD. If KEYRING was
@@ -199,34 +93,19 @@ unlock_gnome_keyring(const char *keyring
                      const char *keyring_password,
                      apr_pool_t *pool)
 {
-  struct gnome_keyring_baton key_info;
+  GnomeKeyringInfo *info;
+  GnomeKeyringResult gkr;
 
-  key_info.info = NULL;
-  key_info.keyring_name = NULL;
+  gkr = gnome_keyring_get_info_sync(keyring_name, &info);
+  if (gkr != GNOME_KEYRING_RESULT_OK)
+    return FALSE;
 
-  /* Get details about the default keyring. */
-  key_info.loop = g_main_loop_new(NULL, FALSE);
-  gnome_keyring_get_info(keyring_name, callback_get_info_keyring,
-                         &key_info, NULL);
-  g_main_loop_run(key_info.loop);
-
-  if (key_info.info == NULL)
-    {
-      callback_destroy_data_keyring(&key_info);
-      return FALSE;
-    }
-  else
-    {
-      key_info.loop = g_main_loop_new(NULL, FALSE);
-      gnome_keyring_unlock(keyring_name, keyring_password,
-                           callback_done, &key_info, NULL);
-      g_main_loop_run(key_info.loop);
-    }
-  callback_destroy_data_keyring(&key_info);
-  if (check_keyring_is_locked(keyring_name))
+  gkr = gnome_keyring_unlock_sync(keyring_name, keyring_password);
+  gnome_keyring_info_free(info);
+  if (gkr != GNOME_KEYRING_RESULT_OK)
     return FALSE;
 
-  return TRUE;
+  return check_keyring_is_locked(keyring_name);
 }
 
 



Mime
View raw message