From e8c209088c7387269f8d652e014b4c1540080417a4f914f2db55eefe7a297bc1 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Tue, 13 May 2014 17:44:26 +0000 Subject: [PATCH] Accepting request 233786 from home:AndreasStieger:branches:devel:tools:scm:svn Apache Subversion 1.8.9 [bnc#877555] OBS-URL: https://build.opensuse.org/request/show/233786 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=169 --- subversion-1.8.8.tar.bz2 | 3 - subversion-1.8.8.tar.bz2.asc | 110 ----------------------- subversion-1.8.9-allow-httpd-2.4.6.patch | 31 +++++++ subversion-1.8.9.tar.bz2 | 3 + subversion-1.8.9.tar.bz2.asc | 80 +++++++++++++++++ subversion-no-build-date.patch | 34 +++---- subversion.changes | 61 +++++++++++++ subversion.spec | 4 +- 8 files changed, 195 insertions(+), 131 deletions(-) delete mode 100644 subversion-1.8.8.tar.bz2 delete mode 100644 subversion-1.8.8.tar.bz2.asc create mode 100644 subversion-1.8.9-allow-httpd-2.4.6.patch create mode 100644 subversion-1.8.9.tar.bz2 create mode 100644 subversion-1.8.9.tar.bz2.asc diff --git a/subversion-1.8.8.tar.bz2 b/subversion-1.8.8.tar.bz2 deleted file mode 100644 index 90ec252..0000000 --- a/subversion-1.8.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 -size 6821200 diff --git a/subversion-1.8.8.tar.bz2.asc b/subversion-1.8.8.tar.bz2.asc deleted file mode 100644 index c401e01..0000000 --- a/subversion-1.8.8.tar.bz2.asc +++ /dev/null @@ -1,110 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG/MacGPG2 v2.0.22 (Darwin) -Comment: GPGTools - http://gpgtools.org - -iQIcBAABCgAGBQJS/VfiAAoJEGLUj60WoN4BNtcQAKK7SnArQnpUgDVQ6scA7zc0 -bV23nxDqEEKMAblB+P/Jms/kKDjC//33PGUOxx0o6hmP+8Dze+zbbk11DRgvKPHQ -+Jr209k2bRC7Wbp/NUrTfLwQV1HNjx17/vya/vbspXRcAXTc4zpCWkSy+/TPbiyh -m21C3+E4W1YsKhnrSrcWozTQn+XAWccYNiDmc6mzu0XTyxYVWsCg+qxnNAq+mS1l -wsC1Kvkm1DGbSHCCgocPop+Woq8GT2p7JV1T5/jE4iLlXCo17cGOG3gSUCqbzKU3 -TCBz8soSrP7w9RbDqxDlaSifjZuBo31OYx3r68CtF63tRvUkjojZTHcVRjk6EqxQ -ysCUUnfYqsouJwJiOO3ez0LsTIexVJASgsEvv4S5KzXEo/McmKSp/JubvaH6qmTp -n0dA5PyuwoAt5ufUYZ5DFjAmVZXjtMHE7hPWAoX7hepfFVE7EodMslo1ffWwlOr6 -xN9BJc7mIJbcdf0cEca7Vak49HPFYndNXOwgdW+VQe0oRPEAsaZulZMMfhAi95SX -NqgHxF2afJkvGUUtLtnHyuyoyG1CSQ8taMZ9M+zUzw0uu/vE2KTwj2N8FnWLqthr -prHU5wpf0TXS+kA1WhTYADTJG/P/ZZAQJpGfbAA8sjj+ZmeYjY1h5ubtyGhrQ7Bz -nXc9B1r3AYAG9lPgUDaA -=yIev ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iQEcBAABCAAGBQJS/gFOAAoJEHbXiOHtGlmc02oH/RRkG310NDQsKF22BdKZeokN -KZ2zX3FbJc3v+4ExqP0kJ2YtZ03n9V09VG4ymqaEjoZzjHnkeVYRcgqd9jCldU46 -C4E0iH5DZOOQ2JtGEhDHzThCnuEt/IzlC04U6ErCCAdyqemDjiSe43MPq0cKpVFJ -qczO2CPE4bPyWcNfYmfp97nNq6d9Je6cesqkWvc3oPaI1C3JgHwu4OFAy7NKYRUD -3P+SyDZMeztzyGcVAwNiWlzFxxOyE7B/cA4MCjt2cHN9Vf9L6nAmNh02EddltdeR -SBNLXnfXmNhDTT21mf4dN693dKy8oCPgBEiCN1Ehj9e4YkX58fith97pxdcxsSM= -=AvzE ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (GNU/Linux) - -iQIcBAABAgAGBQJS/m0EAAoJEJnsdBtXkhrMu5UP/3Z01NZeSYDkbwHibr8uH2dh -0ojZSdeOC46nfhWv/9qF3y0fa0Y9QASMCS4Q8G5kgYbQHQ0vQwmhGrhtjLT05uIL -06dvqeDWg8LLfGbqODF8fYuQF+uIZ6z1+v+zl3pqG1BCB5e5X9F2K9C5yojD5ApC -BH9Icd/9ZxJdwfPouCMRv5QzSrCS+2nBMjmw5gP/D1MHNoa4zV5wDaBWvEnAUjIq -tQPwkTzLqtaGlsQmUGxW7VEuOsD5kM8B+5w6KZu3as1cGrwskUXEns+h3kkZzRCB -/7w7IsQm5zn4qmweJwzmv7R+pkdxh6vgxJByByk/zXssRN8LXvh7VYL/JXNJMlub -QcQv8N3Y+Ia39R/nv23VqVQpkvBfCsqBcPAo6TX4ozr1NOwR8deLNNHpg8TSuj3J -5xWJkpSZzQOZUDmatSBdgHjc7fRzGZtX0oULZVAuvE9U8w1vGWv+NtxorKWXnfGN -MoiY2qZBGSrY/oeeqy7TRV3MjV+VT2ELG51RyTE+pdHArf+nTUxZq5JY5i9HMSr5 -9Js9SHwyOP8N4Hlf4HMH2CAWkCwvsA/MOxqMTZgzgXnw/yFW/zLsu3SuixDbU8Dy -F9JTaaOCjQdXpR0FrbkFNIhkNibjxsThaCA+eTSRqBk5VZHcajQx919yTHXa7qsx -spLjcOZuVD8BK2TvonzO -=uliA ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG/MacGPG2 v2.0.19 (Darwin) -Comment: GPGTools - http://gpgtools.org - -iQEcBAABCgAGBQJTAL2/AAoJECm4ktDIYoUBoUoIAI+uqQ/ZYrtY2MkBbyNq+lzX -rKqwuzMKsn1eS8Za8zkbvmRcL6ZFiI4grLaDpHBVAlsmW+U+PtpGb9iubJ1vglki -JWI+zXvtFiyBjF1AJ7XnjJuHco8ejcQ/D6DTQYz/S0cft+LPy8x3h14VQ2bwe5pK -sS2yxJIKlP6rPqHwQugJiUz1igD3r1n0N5aiglKsPACBEIOgN2O0RXad/EwHW2d1 -kCvdO4Nck6MziP5cykzxyXAnCAAs/pjZaGlnXY+oJHR/XcpI3qetCLDDhLLr2y0u -ZYp/cx10Ryy8ZC9R22ziV3ja92SvGcatL8YaZ2Sw/jAHQSiD1T+AhLRP9WVvwuM= -=xfEA ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG/MacGPG2 v2.0.19 (Darwin) -Comment: GPGTools - http://gpgtools.org - -iQIcBAABCgAGBQJTAL3vAAoJEBvKZYajR5Q/IfAP/RhXUNe5SLIBBNu16ul7hndW -1dah/rgEj9bJXIlUnKm+pc5zCIjcUTx7MtSn63sW6c7UuC1qGOULnr+9zOwfv4KD -wX5iu6bxrJ7SIlHSfQEfTttpFTJ1GwQM1mQttwsglWC4uwC2d7UPizixWHJ7+vqA -k8rVyn4b8kkxeGp8a1LPwPKGq8sohV5byQmIagr4O+ipybAN+YiLlpqvL/VMBhoj -k4YM/aZdefPxVraShWwsv/kpZOai0cZ2hA2+5LO1mhsmyeGcIochAblqD86OlIQ7 -Vvnd8ELN4WwwsTy81PQ49qcz/jml0WerIvEwp1sP98DCC5YrNfKcQ2qMEEziuqKP -owMtOEFS52epf8at40H9gMLTDQeLKuuy+Li2i6DTIgbiT3p1HEA04Ahew5XqVW4g -RsDG+90JwYIKuWwdaGXHhiMw/boLGWWSRwEMVwVWTNt2kRrgbOae25donFJXvZHK -M992+MSjhDuNjFcyRpRaS2nN242MCciMnROi1iK+/bUW7Fu/8Wt53cfsU+AViRzE -gF/b5OVOmOS2C+MwVMyzqFOXEyXv1EuUFEqnzsxgksPec1nPmYA0eCXu7X6m0aFL -5HaUvDqLVV4V2H63GIewBRp244aEuyOuYja38EI5U416l79+vHPKUjzXDGCLlDml -vA178ubt0OgGS68lv5eV -=Xc+2 ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (FreeBSD) - -iQIcBAABAgAGBQJTAO3zAAoJEMSmxiXMyOHffc8P/02/izm1B5AWhTO+XrOZJ+32 -gN/ehfsI7nmzOE4nMkzSPB7C04F8Ag9UjEzqJQ1DgvxEZfrjUNGpXoDczXkCDdh2 -kKdfQCwRMwgOlxHmRwWl+t/Gafein79GFmDVWbs74meC+Qjykpgy4IMi5PvauZcS -LJrnkF16TYm0/2JxVDomkSiKpJSw9QMntKJSihfUUxR9wkdYNHmpmqRWIn5AxMyL -Uau93hby5/+scV9cHMJY4yM0xdHvPrukVHB1FNyuTxHwwVRSCijtpjgegViy4x41 -c0lLKfSluQTaBPbqlmSYN/WB4veDsPW5GvckTGYuS91iqXH8SXJprFRijT1nGiw1 -h4CKbgilOElmbuwbeTSnHCorCkXG8I+5keW3VfzxdwT6R//w+zwv1dR+47QKHQEc -tXIRssm5k5vQGL6Vy200NXLnRVL6hCpQ6bsdUC8NT3yJuJ+K4On2GDdTl82IOsWr -ekSCcSK2iMaKg4yj0Uh9xsUt1m+Dn5lhiMBLtirzQbn9dJmlx02dl9waJrtoleIk -4dErPMYqeWoUo7bs4eOapSxAzzFvcKok7Fm/5RR7hdTiQHFWIZowZc/jUH3JLlNP -zpy+KxP9F7xchcDS1bGWrVgKW4Lk/GNA9925rpUr5rUqzSHF6r5HXVwocB/G4pMF -jaSnaE4hK4B1BpztNMti -=vWIR ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (FreeBSD) - -iQIcBAABAgAGBQJTAO45AAoJEMSmxiXMyOHfnDcP/2YOom3jiQuTIxPxDqxJEyUE -fWnYQJI7r5gTb0f86re6nA46XD7gaQbHhdrbgm9hSEdebQ1GlZW97AZ0NVzTdv+4 -uRrbtiVaI5jwOAE9pxdw4nWlGdPaHlj4B71iG4uaFegwx/biq1ZUa7SQqm2ayGRU -aX/UIEzx2ysrS+rVIpZcFbEfpKA8k4qecDRQpNmZcIR+BvQurALYSnf1vjprUd8i -DjFAEahCztWOarbiQarX5n1/eRtrOSMYy+7NmlpcyRIB76ozpN76FolwRCShObRT -fBxquW3XxZb7FsgqrgVBKu/52U1COu3VsdUhSlLTki3ZsqBJU6UQ04EeHddMLkWz -uOavnLKErA1xg78UerY6HrkZ4keOdHHbC3Lfpu5sHoXCBpI/57RCnGLXDJQht8be -OvD8XlVfUCXBC+Opughz1CZRJb4Swampru50dR33GXXSDMm3PZQzPzgGb//cbhPE -EDfkX+g0a6pnFaftVeS08lRvlPqIpdOzrm1WWOSPKrAYmz4+vmx4TiGEiQevt4/g -RJ/wVslblYupjjT91lneQ8uCwq2Vkpm6slLUlYpm0OpE53b8OTlWCX2Z9NbROdwH -He92xOUqHWbahyPZqtqRQqX4Jn2lolwaL4gryOU9PpmLO8j1O9b+/brjZPgse6kq -psW7iStIzjaJa1sIuDFC -=dsh8 ------END PGP SIGNATURE----- diff --git a/subversion-1.8.9-allow-httpd-2.4.6.patch b/subversion-1.8.9-allow-httpd-2.4.6.patch new file mode 100644 index 0000000..24accae --- /dev/null +++ b/subversion-1.8.9-allow-httpd-2.4.6.patch @@ -0,0 +1,31 @@ +From: Andreas Stieger +Date: Wed, 07 May 2014 20:55:04 +0100 +Subject: Allow building against blacklisted Apache httpd 2.4.6 +References: [bnc#864308] +Upstream: no + +Apache httpd in openSUSE 13.1 is 2.4.6. The mod_dav in this version +is problematic for Apache Subversion and it is blacklisted in via +configure macros in the 1.8.9 release of svn and up. + +The relevant patches have been applied to the apache2 package in +openSUSE:13.1:Update and the update has been released, [bnc#864308]. +This patch enables building Subversion against this fixed package. + +--- + build/ac-macros/apache.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: subversion-1.8.9/build/ac-macros/apache.m4 +=================================================================== +--- subversion-1.8.9.orig/build/ac-macros/apache.m4 2014-04-24 05:01:08.000000000 +0100 ++++ subversion-1.8.9/build/ac-macros/apache.m4 2014-05-07 20:52:04.000000000 +0100 +@@ -128,7 +128,7 @@ if test -n "$APXS" && test "$APXS" != "n + AC_MSG_CHECKING([mod_dav version]) + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" +- blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"] ++ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[5]\")"] + AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex], + [ + #include "$APXS_INCLUDE/ap_release.h" diff --git a/subversion-1.8.9.tar.bz2 b/subversion-1.8.9.tar.bz2 new file mode 100644 index 0000000..ab5e6bc --- /dev/null +++ b/subversion-1.8.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 +size 6828921 diff --git a/subversion-1.8.9.tar.bz2.asc b/subversion-1.8.9.tar.bz2.asc new file mode 100644 index 0000000..687da69 --- /dev/null +++ b/subversion-1.8.9.tar.bz2.asc @@ -0,0 +1,80 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG/MacGPG2 v2.0.22 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCgAGBQJTYT6oAAoJEGLUj60WoN4BNM0P/0ScFUF5OedmVXO37mCBdwkg +TqzGS/otLt+QZF43nc/rWmyRD9QJIgFDrHpfzkFmqvAA8dMKWi6r+CJEd79i5r9D +yZB6GSaQPpC2cY05gom1E8+xEq1+J9yOoSqw7m0MbmEXvlcdiviSoPo5jxOnhwYw +/lOKGi+q2DiKrPKaZgeJFiOP0O3cOXYaB35fdofg+pdbULzTY1wEhbBUjS1cvgqE +2M/aX/8+HeyB4EaXwblSGxCN1ZnHm8dDapPhgPtUWc2r8djMsbbF89Xgh4Am/7e7 +dzvnS8ekfKDgw9gS0f6zorREScpJ+elUjIiC224Wzfdf+7e9AKiM/ugqILYxKSSd +OC9I0VY5915W2M4rsdn+mAuQwCMVGWCGVF/wo9ceSCBtCIlsPzhB25x13LyBPyiZ +b6ZyhHhKgvYAobJ99CSRM0+VzqPppi6UNUoa/zpWc02BJEy6nU7synX5yWx96pbQ +LGJZot5plEncsBeJ6OBz+5Gx+sj3ZT+YKnyj7zMq6G4glVAR+OF8u+QeuOYM9a1t +lfCWq2UzUgxZQ47r1e/WYrJU+ILlSj97vz9NoXGaysQ5upK9YBr3RlGvkHSbx9qH +D+eDG86Nnx0dAxXcJrdMCJ/mBRZiZ7VP968xyHRC6JWG3HGNeFbH2sgp4XAIr0gf +8nVMuSrSu8StEBpYeBcP +=PznO +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQEcBAABCAAGBQJTYVb/AAoJEHbXiOHtGlmcLkAH/2FkqUjzktP18xTqcYLSnG+Y +9XW0TZPxyiZat1j8dKszb4nNWWCnMRzC+JmCPbapzH7g4cYvQwh2sy/7hcGAR1Gj ++NdYI37WkufQYgmQgV+oo7stg3mbNGKZGUXE90pBtWs2bwwMzaYJ7CRY7xS5zA6j +aAYHG39h62A3u2hW92IGm2SwDhnivUjdJLe0YOYrqgtGtlYFQg6yVLiJGq0l8Mo7 +OWav4qz2/HmTNyCsXMDhD5vqaY2P9vG9eYIDiwQEb1krgOVT5EL2uvgHwuap9qRB +vHjr7sNZq2url8aK37qxznJnvLbRbez96OgAg2WYnVmwXVmAVN7uKl6xGStqUrg= +=0cny +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAABAgAGBQJTYsXPAAoJEJnsdBtXkhrMG2QQAMyVmI8Hqf0e06DoS5SUfx/B +mJQKyMinVJW88jZJiAk/1QWWzto8SYFUWX4GgpqzbSYC5MMPsmOGs0R6DTf9GGl0 +g6GHvoKh0uGkJeoGld4jkNoaeaCsgDOygQsOewOhCysvPnF88Abpwfw3X5bB+U/U +mc0md8frSJb80hm9ia8xvikkuXeZPYngTccCVwY64xQsdgu/5boMoRqivBPrdqI7 +OyJXN3O9xQoA1iXWyfVa4VrDBVJWrGirHOP2xvluvWmuDmOso6i2zMhWKt4J2AfD +DC9IIDcUmLD7LIeypETXFmy03LeZTlH/OUGfxNUR7f8ZjpUX7e6hl/ekrtTFgodb +w1UPC+CQtiyP9ilYcMr6nkhWV05QL0xY4GFN7+J/qmq2HymKjYoVIsuisBPutH7E +XxkfNDDYNG84aXsn6O1vrQxD2zFiu8YtoRJoCoOoORHFz31HXU7qG6Z9loqT2BGf ++VAGO3avpH46Eo2J+16rab8clEScT6pYZYvprVPK7JvJnfIhDKLNBhRvmDvdjfh/ +2H7Pyi7sz7g7swyOX46upyDnOTuX5z7zICBecm5XErnwFl0Om08X/6/7FJ1vhfCY +PLn05IBJb88OnIWn9vD4WO3KIwzC/z37Nka7mEP9LLQrW+JVxnvw+4E3m7v7RDW5 +3lT/+jbV7rqnEvv8rFQJ +=Ls4d +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (FreeBSD) + +iQIcBAABAgAGBQJTZ51zAAoJEMSmxiXMyOHf0DQQAIsZxSD5jFoHrbakRDpMBxbr +Lfk141/MLYUIdsw1N1xH95pUlj0tpNIbmEYmF/XwnXnq0cCpCTtQ2ZvMHLNcWC6K +HoFRBJFuiqkX+UoyrYCvKnHiYogXjccdxAtTxF2m+828eBVkax5Up9KTGYnK+X1B +ofRcDMVmA9vXgvHFa8ZIL3AvgAXyvQHtD8IT1eeBsdFnQ/pgKRH9EgfdpuEqqt91 +Y/KyZpUQccirv9Hpg3H9g/ygIhe4o7HLpBeB5XDusKAd/U1VOx3Fhmn9xQCwRIkO +YeBgBnyTX5LgNN2OFLIQK5RJfhp2tZayCYDjSoWMiu3lzfWI8oN26eqtJh88VOyE +Lm9Qw9xSF93SUsTEcBh0EXiR7SHbFPsAHf2/g63TmsVjwMFFWH2j2VCF44KZM3bK +niIyxdHphXAGPh3TWrT43ylwgjtBSzAqid2gpDL/uWfQxVTPp6/vuCn+TkaMdtsD +LPuqKf3e2pfEkugNTMxq3dcXRi357UaJe512o0SV1DfQbc7HLO08c2Hslr9eCCtZ +TyjhqvxEEMpP1fAjxAtrpxojL5OSCP4nxtKSX+gOC3RBMLQN7iAi/D19lKKuIRcK +8Kg0NELqBbWEW17ntm/UBXW057Ij/y/5fXcgXtdarHMCH8IDIU+2sjB6a8AAFrMU +zNGh5cwU+bz1Mbic1Sa+ +=kpKe +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iQIcBAABCAAGBQJTaQudAAoJEB+wZLhO7MSTDgIQAMBwMjQ87imSrXO1gA+u1Kor +cKpI3OWQho03ezCJ/QNkCMW39qVFi1bFBbQFo1/NwsQS15BjfW6Q9cDjOWNgCV9y +xT7ecROSDdNjoiHOFtATeNO7u4FL14o2oHvfawcpds1mYLY6vJf+Q8Sv1AGGFp7L +Qe+HPdiy3QZatbLC1KKpbxb+MBWAI9pdvPCdPp0GzFSXUWBOOQ0zwdTocDnJ+5NO +qfGfP4EN89cKiKQJARSfUZ8VdfjLcGww7JufKzJh+kxYD2B86uAH+4+Dd3Wg+D4b +qslhBDrPZQQAGeRG27vbkNx0MNx7vTW++bT4S2+iWub57a24SPqxbjl/IHHkqbk3 +JcOHnw+GFG+z3P/yxYZqqBhBQV6X3TcqOGWLwNV96R23MGqpmpNfmYsopCu4BOcG +xN+lfyC8qygx0OqJ1ekq9uu+Nb5sxSY2sGALWrde0dSts8TXrzFOJMBxp1VQGxAy +6CYY6wvLb1Mi6rDwmafkXBv8DPxIUakiwI8hpbSdi51oDsY5m6O38IvV+Y4u/1GB +o2Knn1vrFL9nXqiIOD6AQ6c7xTiM02imdcpkQTEAn6ajPdnq3+KoFa+h+Bvc9PZG +gWzRHJO4ZdyBd4/iLwhMOnsd3byXNgvpjJCYpg5+aQ2i+2M5hX9kry1j3RXa8SjG +4hei0GK1blZuLF9FNY5D +=4O2A +-----END PGP SIGNATURE----- diff --git a/subversion-no-build-date.patch b/subversion-no-build-date.patch index e8dfa3f..c222cfb 100644 --- a/subversion-no-build-date.patch +++ b/subversion-no-build-date.patch @@ -13,10 +13,10 @@ Prevent unneccessary rebuilds of binary packages differing only by date, time an subversion/tests/cmdline/getopt_tests_data/svn--version_stdout | 1 - 5 files changed, 6 insertions(+), 12 deletions(-) -Index: subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java +Index: subversion-1.8.9/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java =================================================================== ---- subversion-nightly.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-01 20:57:02.000000000 +0100 -+++ subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2013-04-11 23:50:53.000000000 +0100 +--- subversion-1.8.9.orig/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2014-05-07 20:10:17.000000000 +0100 ++++ subversion-1.8.9/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java 2014-05-07 20:10:26.000000000 +0100 @@ -140,10 +140,10 @@ public class BasicTests extends SVNTests { VersionExtended vx = client.getVersionExtended(false); @@ -30,10 +30,10 @@ Index: subversion-nightly/subversion/bindings/javahl/tests/org/apache/subversion throw new Exception("Build time empty"); result = vx.getBuildHost(); if (result == null || result.trim().length() == 0) -Index: subversion-nightly/subversion/libsvn_subr/opt.c +Index: subversion-1.8.9/subversion/libsvn_subr/opt.c =================================================================== ---- subversion-nightly.orig/subversion/libsvn_subr/opt.c 2013-03-23 14:35:40.000000000 +0000 -+++ subversion-nightly/subversion/libsvn_subr/opt.c 2013-04-11 23:51:47.000000000 +0100 +--- subversion-1.8.9.orig/subversion/libsvn_subr/opt.c 2014-05-07 20:10:17.000000000 +0100 ++++ subversion-1.8.9/subversion/libsvn_subr/opt.c 2014-05-07 20:10:26.000000000 +0100 @@ -1114,12 +1114,8 @@ svn_opt__print_version_info(const char * if (quiet) return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); @@ -49,11 +49,11 @@ Index: subversion-nightly/subversion/libsvn_subr/opt.c SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info))); if (footer) -Index: subversion-nightly/subversion/libsvn_subr/version.c +Index: subversion-1.8.9/subversion/libsvn_subr/version.c =================================================================== ---- subversion-nightly.orig/subversion/libsvn_subr/version.c 2013-03-22 15:59:11.000000000 +0000 -+++ subversion-nightly/subversion/libsvn_subr/version.c 2013-04-11 23:50:53.000000000 +0100 -@@ -125,8 +125,8 @@ svn_version_extended(svn_boolean_t verbo +--- subversion-1.8.9.orig/subversion/libsvn_subr/version.c 2014-05-07 20:10:17.000000000 +0100 ++++ subversion-1.8.9/subversion/libsvn_subr/version.c 2014-05-07 20:10:26.000000000 +0100 +@@ -132,8 +132,8 @@ svn_version_extended(svn_boolean_t verbo { svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info)); @@ -63,21 +63,21 @@ Index: subversion-nightly/subversion/libsvn_subr/version.c + info->build_time = ""; info->build_host = SVN_BUILD_HOST; info->copyright = apr_pstrdup - (pool, _("Copyright (C) 2013 The Apache Software Foundation.\n" -Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout + (pool, _("Copyright (C) 2014 The Apache Software Foundation.\n" +Index: subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout =================================================================== ---- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2012-09-10 22:58:53.000000000 +0100 -+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2013-04-11 23:51:25.000000000 +0100 +--- subversion-1.8.9.orig/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2014-05-07 20:10:17.000000000 +0100 ++++ subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout 2014-05-07 20:10:26.000000000 +0100 @@ -1,5 +1,4 @@ svn, version 1.8.0-dev (under development) - compiled Sep 10 2012, 14:00:24 on i386-apple-darwin11.4.0 Copyright (C) 2012 The Apache Software Foundation. This software consists of contributions made by many people; -Index: subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout +Index: subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout =================================================================== ---- subversion-nightly.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2012-09-10 13:03:34.000000000 +0100 -+++ subversion-nightly/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2013-04-11 23:51:33.000000000 +0100 +--- subversion-1.8.9.orig/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2014-05-07 20:10:17.000000000 +0100 ++++ subversion-1.8.9/subversion/tests/cmdline/getopt_tests_data/svn--version_stdout 2014-05-07 20:10:26.000000000 +0100 @@ -1,5 +1,4 @@ svn, version 0.16.0 (r3987) - compiled Dec 5 2002, 00:02:51 diff --git a/subversion.changes b/subversion.changes index 758146a..42f1d59 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Tue May 13 17:34:59 UTC 2014 - andreas.stieger@gmx.de + +- Apache Subversion 1.8.9 [bnc#877555] +- Client-side bugfixes: + * log: use proper peg revision over DAV + * upgrade: allow upgrading from 1.7 with exclusive locks + * proplist: resolve inconsitent inherited property results + * increase minimal timestamp sleep from 1ms to 10ms + * merge: automatic merge confused by subtree merge + * propget: report proper error on invalid revision for url + * commit: fix an assertion when committing a deleted descendant + * merge: resolve segfault when '--force' merges a directory + delete + * resolve: prevent interactive conflict resolution when nothing + has been done to resolve the conflict + * update: fix locks lost from wc with pre-1.6.17 servers + * merge: honor the 'preserved-conflict-file-exts' setting + * list: fix '--verbose' against older servers + * unlock: fix ability to remove locks with timeouts + * copy: fix 'svn copy URL WC' on relocated working copies + * export: allow file externals to be exported + * move: fix working copy db inconsistency in cert scenarios + * commit: fix an issue where mixed revision copy with non copy + descendants that shadow a not present node couldn't be committed + * delete: properly remove move_to info when the node in its + original location is removed + * status; fix an issue where output would vary based on if the + target was the node itself or its parent +- Server-side bugfixes: + * svnadmin dump: don't let invalid mergeinfo stop dump + * svnserve: resolve performance regression caused by iprops + * reduce size of memory buffer when reading config files + * remove dead transaction if commit was blocked by hook + * svnrdump load: fix crash when svn:* normalization + * fix memcached support + * svndumpfilter: fix order of node record headers + * mod_dav_svn: allow generic DAV clients to refresh locks + * mod_dav_svn: detect out of dateness correctly during commit +- Developer-visible changes: + * improve consistency checks of DAV inherited property requests + * fix ocassional failure in autoprop_tests.py + * avoid duplicate sqlite analyze information rows + * add Mavericks to our sysinfo output + * bump copyright years to 2014 + * unbreak test suite when running as root + * resolve buffer overflow in testcode + * fix libmagic detection with custom LDFLAGS + * fix an out of scope variable use in merge + * javahl: fix crash from resolve callback throwing an exception + * ruby: fix two memory lifetime bugs + * fix a missing null byte when handling old pre-1.4 deltas + * fix building with APR 0.9.x + * make svn_ra_get_locks() and svn_ra_get_lock() report not locked + nodes with a NULL svn_lock_t *, as documented + * fix tests for compiler flags +- Packaging changes: + * adds subversion-1.8.9-allow-httpd-2.4.6.patch to allow building + against blacklisted httpd 2.4.6 which has the required patches + * update subversion-no-build-date.patch for context changes + ------------------------------------------------------------------- Wed Apr 23 16:14:18 UTC 2014 - dmueller@suse.com diff --git a/subversion.spec b/subversion.spec index 18fca2a..aee258e 100644 --- a/subversion.spec +++ b/subversion.spec @@ -40,7 +40,7 @@ %define svnuser svn Name: subversion -Version: 1.8.8 +Version: 1.8.9 Release: 0 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 @@ -177,6 +177,7 @@ Patch20: subversion-swig-perl-install_vendor.patch Patch23: subversion.libtool-pie-flags.patch Patch31: subversion.perl.LD_RUN_PATH.patch Patch37: subversion-no-build-date.patch +Patch38: subversion-1.8.9-allow-httpd-2.4.6.patch # %if %with_ruby %define rb_arch %(echo "%{_host_cpu}-%{_os}" | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") @@ -340,6 +341,7 @@ popd #./sqlite-amalgamation %patch23 -p1 %patch31 -p1 %patch37 -p1 +%patch38 -p1 SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") #"