diff options
author | 2014-12-16 12:16:02 +0000 | |
---|---|---|
committer | 2014-12-16 12:16:02 +0000 | |
commit | 9c11621ded2e3761f3eabb76b6e6d1bde7b25fcf (patch) | |
tree | a264227ef13e7d51f6461399a84468e610ebaa7a /dev-vcs | |
parent | Update multilib deps for more versions (diff) | |
download | historical-9c11621ded2e3761f3eabb76b6e6d1bde7b25fcf.tar.gz historical-9c11621ded2e3761f3eabb76b6e6d1bde7b25fcf.tar.bz2 historical-9c11621ded2e3761f3eabb76b6e6d1bde7b25fcf.zip |
Security bump (bug #532406). Removed old
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/subversion/ChangeLog | 14 | ||||
-rw-r--r-- | dev-vcs/subversion/Manifest | 32 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch | 56 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch | 165 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch | 298 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch | 44 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch | 48 | ||||
-rw-r--r-- | dev-vcs/subversion/files/svnserve.initd | 26 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.8.11.ebuild (renamed from dev-vcs/subversion/subversion-1.8.9.ebuild) | 61 |
9 files changed, 69 insertions, 675 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index a299f9e651ff..ee8ed1213221 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.205 2014/12/14 02:52:50 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.206 2014/12/16 12:16:00 polynomial-c Exp $ + +*subversion-1.8.11 (16 Dec 2014) + + 16 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -subversion-1.8.9.ebuild, + +subversion-1.8.11.ebuild, + -files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch, + -files/subversion-1.6.2-local_library_preloading.patch, + -files/subversion-1.6.3-kwallet_window.patch, + -files/subversion-1.7.6-kwallet.patch, + -files/subversion-1.7.6-revert-mod_dontdothat-move.patch, + -files/svnserve.initd: + Security bump (bug #532406). Removed old. 14 Dec 2014; Manuel Rüger <mrueg@gentoo.org> subversion-1.8.10-r1.ebuild: Add support for kde applications dependency. diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 0de5c23e6a36..6fc6923f54be 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,28 +1,42 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 47_mod_dav_svn.conf 422 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d WHIRLPOOL 05f1048e41c9c59718fc794ae53de532565447186a2cef45a222bee3d45071976037cc2aa3d90b27df1c02c01ce262c7b8030c4ad021cd597f277b8b48c7d976 AUX 70svn-gentoo.el 443 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be SHA512 ab105533569ec81631491da4cd29488e77ae5713b5a2190afe1576e6434202a0c36fce7674cdf17a3e1e58650efba8915fb7e31c686def3701ef82803ecf8bea WHIRLPOOL 4f699ca38a1659ac2129f36de37ddd830d026520c1bf34562181ceb4763a38362cc3df516c3077ddbd66f36973d0c82f2d51d3a4657ba0af3722e61b29b4a53f AUX subversion-1.5.4-interix.patch 4375 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe SHA512 e63c49ae3935be14437702136175d38fac1a820ccc641eb9d94e51d89986847a408b49995c01dcfa4d45c3bf04c94134def117ff27802b3eb02a6268d6032b75 WHIRLPOOL 77d60f127f2132c6e5a8a00f4f6603dfeec8708b36dbbac8d806dc0bedcfd36426661adff6c49895c73dfb16883e18e0cdbc81f3a43d3f1ecace744a25a394a7 AUX subversion-1.5.6-aix-dso.patch 787 SHA256 2790b21e035ea77358d33c14e7e7c3c8977e1b3f5d4150768912eea719e2cf6c SHA512 8cf3495c8239f47193d0f67084b88cd2a601586a0d933512a6326522f5c87310a636ab7928c1c13e4adf1cbaf756eca77f025be9af947dcff3f1661f0f2e9347 WHIRLPOOL 40c3397dcc9371ae9d6badd7aeb56b01d6de1729fd84dc4c17e27c0f723869354b04cb4b21749890af5f9366f504789d1c2f63287a15e6bad566760a36e24625 -AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96 SHA512 62369a0046e4c0a786a0b0a355630425f86514ebe7c9efb8757acebf9ceafb1bda7c075e6941a3fa0d1b763d5cea6b407e63cb2dfe9f773c268435823db219fb WHIRLPOOL 65f55fc690b5a1b03b1afd9c55aa15121940df16c3feb6e236c2c33e6b45049f679368791729e22e5f1c7c435dbd165fd2b9fb55d856a45cc3cfbbd4546bf00e -AUX subversion-1.6.2-local_library_preloading.patch 6412 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d SHA512 df37e02c4c1354d854be252368f4eef4b6fcf1b28b8fc81788a41619bae77a470962950eabb7eca0e9fd7d84bfd15c319d9140acacbaf4bd7ebed41b4a5962c4 WHIRLPOOL 5d8fbfd1bbc6b642696d0cfef0bf2bfe60a874f707f7cf1dac1adee38a1a898bd2ebc66210ab6faf6b32dc8521ade79b88a592c229c19f18f06d59cbb5133d1b AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 SHA512 4ca24738d527c8f845e0d255950f0121a445ec1357bea03e2c3cd0c1ca077f8aefd6769eb4dc4bc3787c593c9542f3a64ad283ae5154201a7fcf2392e7ea076b WHIRLPOOL d90944d8cb30db9e8f88606f5054cc54af0a2f496125f6462237b964b2f4faefdde94b26c9a80e9273d19fffbce71cbf89dba961300c3a764de4c21782499533 -AUX subversion-1.6.3-kwallet_window.patch 10012 SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de SHA512 e21fc601ee23ca75ebf089627e425696e39015fc9ceb55defc85d758e3a9ee191c11a7af8b78857b32c821730313b75b237b674d1eec31e51292b82f4fe10352 WHIRLPOOL 74fcd09ff7f4e6831ef1708970794f7b16e711fe0d264c4d5748afae7ed071b301ef72021076d14260d9032be873930d59ca87c0b92cbb6174d3a0cab1c071f5 -AUX subversion-1.7.6-kwallet.patch 1624 SHA256 61a1f2c9a05553ab874a07765e9680bcf7af5adc843fcfaf7f6c4c0a1e5454a7 SHA512 90b8b2e8200f54deeb2da7b79d133b57863b3279dc7bb169e1d71ee54c9c727bda5cd60abdfb5076f25a6273bd64ccfa3c577e55d70545fa252dd1092eefcdde WHIRLPOOL fcb1ca01e3b2e510d9a9bb2614d0a4893414d0093a05e2930edb98ef1c2d7cb2e136b1f714172858a327db4beea7995274e37db8ebf98f4fcb7cc8ad6063144c -AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd SHA512 927be300babe1692f4ca942e8e9fc3e4211aa3890c22adf6a70804c7293761335015da98040ed3acdee3f151b7f92a8d15014589b718711165ebf638f35b56a3 WHIRLPOOL 65d01a348c11dcfe6f23d6f0761f47ee328774b0dc954c56194fed12fe6945d4c408be55d852cba5f541aff4efc118abc07d2cfd1a45c4a6b77d7528b4da1d45 AUX subversion-1.8.0-hpux-dso.patch 615 SHA256 1ef3e8ae4d881ae9eec6c6e40ddff2e326357e39069c53b84e51b138f05d409a SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 WHIRLPOOL d9050799234d2af014d054ab4a9e13e3f6cd24981e1a4ae6f3313216cc744450e6bfe5aa0bb95ef777e7253b2c1f2609cb678a32a0d3e9ada77b20569b6f5a6c AUX subversion-1.8.1-revert_bdb6check.patch 3160 SHA256 4b42624c83c87a19c9e1f60fb08b1875e2de696bc6b92835e1404d689d078954 SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 WHIRLPOOL 168f53408a1d9ab6f60dd1b5413b2187da832bec960a52d68757edf3ffd187e44672f15b08ac26fb6f966b91ea888da7525020d6d1a6148736f15e713efd3f62 AUX subversion-1.8.5-swig-python-no-gnome-keyring.patch 39439 SHA256 0e0e8364ef4ba9835968a68329020f0ae1047c9d06c440a4bca21fa0f5effe19 SHA512 ecb8a11ae3fe8904d2381b85f841eedaf4d1f303baf079aab9a83a70c4b34212c7399f86276fb3e5b34557b2dde911f7abb246fe14cbc0a6b8c5fa15357d01a0 WHIRLPOOL e95ffc62e915814e359e9f603c8c2688395d45ef7a04aab107df46ed001c6741c0a74b8c02091af8eb84b294bd74b73f1adbb202965827d6647926e2292d3e50 AUX subversion-1.8.9-po_fixes.patch 865 SHA256 8c11210cc649172b9a229081d7d9e169eebd1dde648774882974bcd68101565d SHA512 71922f67b8d7d8b2c1e5ccb4af240ccd748e42a8c04c7a138f7678431afb97c90517c22aa43dddee72b0025dcdb8751c90075806d5003e888bc8592475271eae WHIRLPOOL 1880d0c00c486512c6c0c81f90428d6693104388d3905290ad1498d7f11656e95bee8368b91ed53f7867dff26e585d48f619d2eaf91e4a81132caee4a6a98d1d AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8 -AUX svnserve.initd 818 SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142 SHA512 aa5493c364a761bef8728187bdbf9ed89f341121be502d3dabfc377c43b973d71eba38145c7e2679a0d457000396af164e5ca8f6f7d23c8a5fb61134f55297d7 WHIRLPOOL 5b0114b76ee2d8c6e8925a6d294826b5d08afcf4c98145cceed9c59459740e40a8cac58493d5838d58004e44f32ef77dc8bdba2475fba4742e47c28b6c4ba8ca AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81 AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962 DIST subversion-1.7.18.tar.bz2 6096031 SHA256 f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a SHA512 7a73b262701f7df6bc61acec4a38e8f6a04ff923a4b21669dba62d5357eb6ebce9e47d044d246ed9889eeefc6413569b5e4ee0f53cc9e78f8d24edb30e47f1a3 WHIRLPOOL b5bc15b8ae805659abbbc3f00f052f0b25f030a05a2ca5a60ee5e884b8dac6ff800a8c8d73b374c5c4f64df0fe17628a43f81e10047134a2ffef241c9a5ee90f DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022 -DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf +DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247 EBUILD subversion-1.7.18.ebuild 14612 SHA256 3490b4d8419cc9e453bd9be62eee81e1d4149e39c6b449ad7b1afc247a94d8a0 SHA512 0a63b5fe60d35f440ac73507b1c14f265928c28c11680ba6961d434924198ed77ef34d8a465f1a3766634df29777db1cd3b62b6f01d4fb63ecba5fda8b27c94f WHIRLPOOL 534dc36932a61c0808ad48e09230eb705fe19342d11ec1bf5d8040b8b64540d6cd85b3a3525d6263cb457857f431ec5d7c5aa69623bf9aa17f6a2f926ed5ea7b EBUILD subversion-1.8.10-r1.ebuild 15446 SHA256 aab1d6deaa34045d6c003b0af812ca0e2020ee5b71edc073633ff5876f45137e SHA512 edc001f6cd816f7807ba82f41bbac09b3130eabfef67533b1b60f741410d9b6b924c76796c7cb7e0d83865e044ef63579385df3f1c38852abc0724587417502c WHIRLPOOL 33b887264d48c22d2be05ef82a092c70ff7574dd3c760bfead68d49220663fb3edd64e0555094b164692b2f4a9a7951b7ce7d6ad55fedc88ce05d8c2e2e2d6d8 EBUILD subversion-1.8.10.ebuild 15358 SHA256 c4405957ab20c1c173849d64cdb1d1fce71b48a906bd8c8ccff2ba6ef969d96b SHA512 905154697c85c822e527504685f70f42fef9de220ef0bb72cb217c6b1322ec60f1b8809e6956e768698b8864ad1e2d2a45f6861fcbb8804f14d8ac1ad6c1f0c8 WHIRLPOOL 2a169bc4643bde4c66166ddc8511cc358776b8be45c864bca719c1facaf6775ebbe5e761fa8162486c3ac28508743bf7f70f637e8ead03acddf346c225b98cd3 -EBUILD subversion-1.8.9.ebuild 15216 SHA256 7490c3ca7fbd63eb5916d256701162708d7d027296642a87b5fc2547fe5a3b0b SHA512 7aebe2f31102e53e57b9a7a442352d437792dc5a71fcc66fd4085daee282fe63706bc9e40499cb053143a6187e7dccd1d27de58d013219a234664655bf079f92 WHIRLPOOL 313cda4e0ba27001cef1718e9a30b5a563bb0ee44b49c16027a78b50c7db4696c266e258fbb3000f7d6cabdaac303e31c3d3a0073c53f7e52eece9c97a73dcd8 -MISC ChangeLog 102212 SHA256 12a5370a7387508a8f49b1d5059413721d1e776d613d1fcce3df1e3fe18b2e91 SHA512 30290fd08ed699624cf0555ab906c7b63745d550635354bcedf95144515ea92b386016d48d54b3ea375eab18482011a15b1ba41618e873874c78868c7ce28a58 WHIRLPOOL d4caf2d4fad155430ba2a9f27c9bb78951328f025ce4e7fe0647eda99fba21254da63ea1013b3cdc23d2606bdea67889a46f9364791c54c52e7de04987cdbfcb +EBUILD subversion-1.8.11.ebuild 15405 SHA256 5585abf4af9ec7c732c465a9531513c57d8abaca0b891e445cf4ce584444706e SHA512 2cd29ecca4185c66e8738e68e51dab4a6da1bb1f0dcb4e15f034818c5e2ae76b1c201e3c940ef95e938361be5df591a1b699bec7b852169a968482fbd317f07b WHIRLPOOL 0c315092e128263cce632837259c1ddc4775a7be349531e7a3746f7750304207128002666eb5aef77d65fc271bdba539f0f510f840e3cd1388421700a7062f94 +MISC ChangeLog 102715 SHA256 4fdf10421e48ded6cc50783e23ab426e52b0e4e58b4a2450390d40642ac06f32 SHA512 5e4d4ad8203922170993f72cd25638c1d93d1ace40b48038d1f2818bf14f4d3d117968aed4c1df9a0b165e04d0d61bea49cd466109679a586e8133ec3a2ebbaf WHIRLPOOL ec33bc6537d68b4beb41879d6b465eccb4faf03d41d337945c3f029cad01296587818fb50bd94ece0f68e1510eadb43e3bb3279fe84fbbee9956443677b11fe4 MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAEBCAAGBQJUkCKCAAoJEPiazRVxLXTFWaIQAN8YRulIRVdSFlEJjiXyjmxf +RbX/psRLRzgsWFPgDjMKyfbpk8YNWMsYhIFeUq3WElggvKI49hRybeMttOmAvn2/ +p4B88ui2QGE5eJ9OQzZQOznMcsNFSpU27YDS1J6F7asj0XTgR3/rzi2vwB3gYcZ/ +LzQDYvODEqNJ0lVtwfr5l+rcxAdWpPzlZLchBW5RJvyrBtpknrp8CiIG90dzUb/z +uY2u7dStis5XiPpGwqdpqmh24h773dstm/1bfTTTJ9ZdtkccO/XpgaQWCq91G1O7 +zKPvAlsnGRt6/xhK3CMpFpVOF9raQemutO8+G6f8GUsSiXRHL1XmK0cLoDjS2R3P +UFMMnybtJjgm6++Kzh8P7pIh70JNlXo7mHfQviaexNBaxbGyHPO1yvXBUpXeF0fK +lH+udKxmMsiMZthzc++Ts31I16TWWjYhJsv6ugRuVPKmp0MnPl6ZHoJlt0fTKk5d +QaLjqCw1hwGYNdkbI+CyKiyj+jzEw610zeMNPwW29wqwxxx5GdhcV4CBlU3knKij +hNarsuNHz1djHb7L+QxecY7Ueo+O/75JDOxOVRunTATa03txAEwCb63/zwiW2Gf3 +sEs7Seq2SfHHs1H+0jsoIQpLa7dxNE1PqetqZ+yMKGsCClv1o1E3AbVOUD05LPvJ +tTRmUP9pHYSYnjNNJ0Gt +=Tcp8 +-----END PGP SIGNATURE----- diff --git a/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch b/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch deleted file mode 100644 index 689b29cd7fc7..000000000000 --- a/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -47,6 +47,7 @@ - SVN_SASL_LIBS = @SVN_SASL_LIBS@ - SVN_SERF_LIBS = @SVN_SERF_LIBS@ - SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ -+SVN_XML_LIBS = -lexpat - SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ - - LIBS = @LIBS@ ---- build/ac-macros/aprutil.m4 -+++ build/ac-macros/aprutil.m4 -@@ -77,16 +77,14 @@ - AC_MSG_ERROR([apu-config --prefix failed]) - fi - -- dnl When APR stores the dependent libs in the .la file, we don't need -- dnl --libs. -- SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`" -+ SVN_APRUTIL_LIBS="`$apu_config --link-libtool`" - if test $? -ne 0; then -- AC_MSG_ERROR([apu-config --link-libtool --libs failed]) -+ AC_MSG_ERROR([apu-config --link-libtool failed]) - fi - -- SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`" -+ SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`" - if test $? -ne 0; then -- AC_MSG_ERROR([apu-config --link-ld --libs failed]) -+ AC_MSG_ERROR([apu-config --link-ld failed]) - fi - - AC_SUBST(SVN_APRUTIL_INCLUDES) ---- build/ac-macros/apr.m4 -+++ build/ac-macros/apr.m4 -@@ -74,16 +74,14 @@ - AC_MSG_ERROR([apr-config --prefix failed]) - fi - -- dnl When APR stores the dependent libs in the .la file, we don't need -- dnl --libs. -- SVN_APR_LIBS="`$apr_config --link-libtool --libs`" -+ SVN_APR_LIBS="`$apr_config --link-libtool`" - if test $? -ne 0; then -- AC_MSG_ERROR([apr-config --link-libtool --libs failed]) -+ AC_MSG_ERROR([apr-config --link-libtool failed]) - fi - -- SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`" -+ SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`" - if test $? -ne 0; then -- AC_MSG_ERROR([apr-config --link-ld --libs failed]) -+ AC_MSG_ERROR([apr-config --link-ld failed]) - fi - - SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`" diff --git a/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch b/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch deleted file mode 100644 index 704b30026fb3..000000000000 --- a/dev-vcs/subversion/files/subversion-1.6.2-local_library_preloading.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -198,6 +198,24 @@ - - AC_SUBST(LT_LDFLAGS) - -+AC_ARG_ENABLE(local-library-preloading, -+ AS_HELP_STRING([--disable-local-library-preloading], -+ [Disable preloading of locally built libraries in locally built executables]), -+ [ -+ if test "$enableval" != "no"; then -+ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts" -+ else -+ TRANSFORM_LIBTOOL_SCRIPTS="" -+ fi -+ ], [ -+ if test "`uname`" != "Darwin"; then -+ TRANSFORM_LIBTOOL_SCRIPTS="transform-libtool-scripts" -+ else -+ TRANSFORM_LIBTOOL_SCRIPTS="" -+ fi -+]) -+AC_SUBST(TRANSFORM_LIBTOOL_SCRIPTS) -+ - dnl Check if -no-undefined is needed for the platform. - dnl It should always work but with libtool 1.4.3 on OS X it breaks the build. - dnl So we only turn it on for platforms where we know we really need it. ---- Makefile.in -+++ Makefile.in -@@ -309,7 +309,10 @@ - - @INCLUDE_OUTPUTS@ - --local-all: @BUILD_RULES@ -+local-all: @BUILD_RULES@ @TRANSFORM_LIBTOOL_SCRIPTS@ -+ -+transform-libtool-scripts: @BUILD_RULES@ -+ @$(top_srcdir)/build/transform_libtool_scripts.sh - - locale-gnu-pot: - cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \ ---- build/transform_libtool_scripts.sh -+++ build/transform_libtool_scripts.sh -@@ -0,0 +1,121 @@ -+#!/bin/sh -+# -+# -+# Licensed to the Apache Software Foundation (ASF) under one -+# or more contributor license agreements. See the NOTICE file -+# distributed with this work for additional information -+# regarding copyright ownership. The ASF licenses this file -+# to you under the Apache License, Version 2.0 (the -+# "License"); you may not use this file except in compliance -+# with the License. You may obtain a copy of the License at -+# -+# http://www.apache.org/licenses/LICENSE-2.0 -+# -+# Unless required by applicable law or agreed to in writing, -+# software distributed under the License is distributed on an -+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -+# KIND, either express or implied. See the License for the -+# specific language governing permissions and limitations -+# under the License. -+# -+# -+ -+# Dependencies of libraries -+subr="subr" -+auth_gnome_keyring="auth_gnome_keyring $subr" -+auth_kwallet="auth_kwallet $subr" -+delta="delta $subr" -+diff="diff $subr" -+fs_util="fs_util $subr" -+fs_base="fs_base $delta $fs_util $subr" -+fs_fs="fs_fs $delta $fs_util $subr" -+fs="fs $fs_base $fs_fs $fs_util $subr" -+repos="repos $delta $fs $fs_util $subr" -+ra_local="ra_local $delta $fs $fs_util $repos $subr" -+ra_neon="ra_neon $delta $subr" -+ra_serf="ra_serf $delta $subr" -+ra_svn="ra_svn $delta $subr" -+ra="ra $delta $ra_local $ra_neon $ra_serf $ra_svn $subr" -+wc="wc $delta $diff $subr" -+client="client $delta $diff $ra $subr $wc" -+ -+# Variable 'libraries' containing names of variables corresponding to libraries -+libraries="auth_gnome_keyring auth_kwallet client delta diff fs fs_base fs_fs fs_util ra ra_local ra_neon ra_serf ra_svn repos subr wc" -+ -+for library in $libraries; do -+ # Delete duplicates in dependencies of libraries -+ library_dependencies="$(echo -n $(for x in $(eval echo "\$$library"); do echo $x; done | sort -u))" -+ eval "$library=\$library_dependencies" -+done -+ -+# Dependencies of executables -+svn="$auth_gnome_keyring $auth_kwallet $client $delta $diff $ra $subr $wc" -+svnadmin="$delta $fs $repos $subr" -+svndumpfilter="$delta $fs $repos $subr" -+svnlook="$delta $diff $fs $repos $subr" -+svnserve="$delta $fs $ra_svn $repos $subr" -+svnsync="$auth_gnome_keyring $auth_kwallet $delta $ra $subr" -+svnversion="$subr $wc" -+entries_dump="$subr $wc" -+ -+# Variable 'executables' containing names of variables corresponding to executables -+executables="svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion entries_dump" -+ -+for executable in $executables; do -+ # Set variables containing paths of executables -+ if [ "$executable" != entries_dump ]; then -+ eval "${executable}_path=subversion/$executable/$executable" -+ else -+ eval "${executable}_path=subversion/tests/cmdline/entries-dump" -+ fi -+ # Delete duplicates in dependencies of executables -+ executable_dependencies="$(echo -n $(for x in $(eval echo "\$$executable"); do echo $x; done | sort -u))" -+ eval "$executable=\$executable_dependencies" -+done -+ -+test_paths="$(find subversion/tests -mindepth 2 -maxdepth 2 -name '*-test' ! -path '*/.libs/*' | sort)" -+for test in $test_paths; do -+ test_path="$test" -+ # Dependencies of tests are based on names of directories containing tests -+ test_library="$(echo $test | sed -e 's:^subversion/tests/libsvn_\([^/]*\)/.*:\1:')" -+ test_dependencies="$(eval echo "\$$test_library")" -+ # Set variables corresponding to tests and containing dependencies of tests -+ test="$(echo $test | sed -e 's:^subversion/tests/libsvn_[^/]*/\(.*\):\1:' -e 's/-/_/g')" -+ eval "$test=\$test_dependencies" -+ # Set variables containing paths of tests -+ eval "${test}_path=\$test_path" -+ # Set variable 'tests' containing names of variables corresponding to tests -+ tests="$tests $test" -+done -+ -+# auth-test dynamically loads libsvn_auth_gnome_keyring and libsvn_auth_kwallet libraries -+auth_test="auth_gnome_keyring auth_kwallet $auth_test" -+ -+# Usage: sed_append LINE_NUMBER TEXT FILE -+sed_append() -+{ -+ sed -e "$1a\\ -+$2" "$3" > "$3.new" -+ mv -f "$3.new" "$3" -+} -+ -+current_directory="$(pwd)" -+for libtool_script in $executables $tests; do -+ eval "libtool_script_path=\$${libtool_script}_path" -+ libtool_script_libraries="" -+ if [ -f "$libtool_script_path" ]; then -+ if { grep LD_LIBRARY_PATH "$libtool_script_path" && ! grep LD_PRELOAD "$libtool_script_path"; } > /dev/null; then -+ echo "Transforming $libtool_script_path" -+ libtool_script_dependencies="$(eval echo "\$$libtool_script")" -+ for libtool_script_dependency in $libtool_script_dependencies; do -+ libtool_script_library="$current_directory/subversion/libsvn_$libtool_script_dependency/.libs/libsvn_$libtool_script_dependency-1.so" -+ [ -f "$libtool_script_library" ] && libtool_script_libraries="$libtool_script_libraries $libtool_script_library" -+ done -+ libtool_script_libraries="${libtool_script_libraries# *}" -+ # Append definitions of LD_PRELOAD to libtool scripts -+ sed_append 4 "LD_PRELOAD=\"$libtool_script_libraries\"" "$libtool_script_path" -+ sed_append 5 "export LD_PRELOAD" "$libtool_script_path" -+ chmod +x "$libtool_script_path" -+ fi -+ fi -+done diff --git a/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch b/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch deleted file mode 100644 index 4bb9c09f0a4c..000000000000 --- a/dev-vcs/subversion/files/subversion-1.6.3-kwallet_window.patch +++ /dev/null @@ -1,298 +0,0 @@ -https://svn.collab.net/viewvc/svn?view=revision&revision=38004 -https://svn.collab.net/viewvc/svn?view=revision&revision=38014 -https://svn.collab.net/viewvc/svn?view=revision&revision=38028 -https://svn.collab.net/viewvc/svn?view=revision&revision=38122 - ---- subversion/libsvn_auth_kwallet/kwallet.cpp -+++ subversion/libsvn_auth_kwallet/kwallet.cpp -@@ -22,6 +22,7 @@ - - /*** Includes. ***/ - -+#include <stdlib.h> - #include <string.h> - #include <unistd.h> - -@@ -30,6 +31,9 @@ - #include "svn_auth.h" - #include "svn_config.h" - #include "svn_error.h" -+#include "svn_io.h" -+#include "svn_pools.h" -+#include "svn_string.h" - #include "svn_version.h" - - #include "private/svn_auth_private.h" -@@ -38,13 +42,20 @@ - - #include <dbus/dbus.h> - #include <QtCore/QCoreApplication> -+#include <QtCore/QList> -+#include <QtCore/QMap> - #include <QtCore/QString> -+#include <QtGui/QApplication> -+#include <QtGui/QX11Info> - - #include <kaboutdata.h> - #include <kcmdlineargs.h> - #include <kcomponentdata.h> - #include <klocalizedstring.h> - #include <kwallet.h> -+#include <kwindowsystem.h> -+#include <netwm.h> -+#include <netwm_def.h> - - - /*-----------------------------------------------------------------------*/ -@@ -52,6 +63,28 @@ - /*-----------------------------------------------------------------------*/ - - -+#define INITIALIZE_APPLICATION \ -+ if (apr_hash_get(parameters, \ -+ "svn:auth:qapplication-safe", \ -+ APR_HASH_KEY_STRING)) \ -+ { \ -+ QApplication *app; \ -+ if (! qApp) \ -+ { \ -+ int argc = 1; \ -+ app = new QApplication(argc, (char *[1]) {(char *) "svn"}); \ -+ } \ -+ } \ -+ else \ -+ { \ -+ QCoreApplication *app; \ -+ if (! qApp) \ -+ { \ -+ int argc = 1; \ -+ app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); \ -+ } \ -+ } -+ - static const char * - get_application_name(apr_hash_t *parameters, - apr_pool_t *pool) -@@ -69,8 +102,7 @@ - const char *svn_application_name; - if (svn_application_name_with_pid) - { -- long pid = getpid(); -- svn_application_name = apr_psprintf(pool, "Subversion [%ld]", pid); -+ svn_application_name = apr_psprintf(pool, "Subversion [%ld]", long(getpid())); - } - else - { -@@ -102,9 +134,108 @@ - } - } - -+static pid_t -+get_parent_pid(pid_t pid, -+ apr_pool_t *pool) -+{ -+ pid_t parent_pid = 0; -+ -+#ifdef __linux__ -+ svn_stream_t *stat_file_stream; -+ svn_string_t *stat_file_string; -+ const char *preceeding_space, *following_space, *parent_pid_string; -+ -+ const char *path = apr_psprintf(pool, "/proc/%ld/stat", long(pid)); -+ svn_error_t *err = svn_stream_open_readonly(&stat_file_stream, path, pool, pool); -+ if (err == SVN_NO_ERROR) -+ { -+ err = svn_string_from_stream(&stat_file_string, stat_file_stream, pool, pool); -+ if (err == SVN_NO_ERROR) -+ { -+ if ((preceeding_space = strchr(stat_file_string->data, ' '))) -+ { -+ if ((preceeding_space = strchr(preceeding_space + 1, ' '))) -+ { -+ if ((preceeding_space = strchr(preceeding_space + 1, ' '))) -+ { -+ if ((following_space = strchr(preceeding_space + 1, ' '))) -+ { -+ parent_pid_string = apr_pstrndup(pool, -+ preceeding_space + 1, -+ following_space - preceeding_space); -+ parent_pid = atol(parent_pid_string); -+ } -+ } -+ } -+ } -+ } -+ } -+ -+ if (err) -+ { -+ svn_error_clear(err); -+ } -+#endif -+ -+ return parent_pid; -+} -+ -+static WId -+get_wid(apr_hash_t *parameters, -+ apr_pool_t *pool) -+{ -+ WId wid = 1; -+ -+ if (apr_hash_get(parameters, -+ "svn:auth:qapplication-safe", -+ APR_HASH_KEY_STRING)) -+ { -+ QMap<pid_t, WId> process_info_list; -+ QList<WId> windows(KWindowSystem::windows()); -+ QList<WId>::const_iterator i; -+ for (i = windows.begin(); i != windows.end(); i++) -+ { -+ process_info_list[NETWinInfo(QX11Info::display(), -+ *i, -+ QX11Info::appRootWindow(), -+ NET::WMPid).pid()] = *i; -+ } -+ -+ apr_pool_t *iterpool = svn_pool_create(pool); -+ pid_t pid = getpid(); -+ while (pid != 0) -+ { -+ svn_pool_clear(iterpool); -+ if (process_info_list.contains(pid)) -+ { -+ wid = process_info_list[pid]; -+ break; -+ } -+ pid = get_parent_pid(pid, iterpool); -+ } -+ svn_pool_destroy(iterpool); -+ } -+ -+ if (wid == 1) -+ { -+ const char *wid_env_string = getenv("WINDOWID"); -+ if (wid_env_string) -+ { -+ long wid_env = atol(wid_env_string); -+ if (wid_env != 0) -+ { -+ wid = wid_env; -+ } -+ } -+ } -+ -+ return wid; -+} -+ - static KWallet::Wallet * - get_wallet(QString wallet_name, -- apr_hash_t *parameters) -+ apr_hash_t *parameters, -+ apr_pool_t *pool) - { - KWallet::Wallet *wallet = - static_cast<KWallet::Wallet *> (apr_hash_get(parameters, -@@ -115,7 +246,7 @@ - APR_HASH_KEY_STRING)) - { - wallet = KWallet::Wallet::openWallet(wallet_name, -- -1, -+ pool ? get_wid(parameters, pool) : 1, - KWallet::Wallet::Synchronous); - } - if (wallet) -@@ -141,7 +272,7 @@ - apr_hash_t *parameters = static_cast<apr_hash_t *> (data); - if (apr_hash_get(parameters, "kwallet-initialized", APR_HASH_KEY_STRING)) - { -- KWallet::Wallet *wallet = get_wallet(NULL, parameters); -+ KWallet::Wallet *wallet = get_wallet(NULL, parameters, NULL); - delete wallet; - apr_hash_set(parameters, - "kwallet-initialized", -@@ -172,12 +303,7 @@ - return FALSE; - } - -- QCoreApplication *app; -- if (! qApp) -- { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -- } -+ INITIALIZE_APPLICATION - - KCmdLineArgs::init(1, - (char *[1]) {(char *) "svn"}, -@@ -195,7 +321,7 @@ - QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); - if (! KWallet::Wallet::keyDoesNotExist(wallet_name, folder, key)) - { -- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); -+ KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool); - if (wallet) - { - apr_hash_set(parameters, -@@ -242,12 +368,7 @@ - return FALSE; - } - -- QCoreApplication *app; -- if (! qApp) -- { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -- } -+ INITIALIZE_APPLICATION - - KCmdLineArgs::init(1, - (char *[1]) {(char *) "svn"}, -@@ -262,7 +383,7 @@ - QString q_password = QString::fromUtf8(password); - QString wallet_name = get_wallet_name(parameters); - QString folder = QString::fromUtf8("Subversion"); -- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); -+ KWallet::Wallet *wallet = get_wallet(wallet_name, parameters, pool); - if (wallet) - { - apr_hash_set(parameters, ---- subversion/svn/main.c -+++ subversion/svn/main.c -@@ -2067,6 +2067,9 @@ - pool))) - svn_handle_error2(err, stderr, TRUE, "svn: "); - -+ /* svn can safely create instance of QApplication class. */ -+ svn_auth_set_parameter(ab, "svn:auth:qapplication-safe", "1"); -+ - ctx->auth_baton = ab; - - /* Set up conflict resolution callback. */ ---- subversion/svnsync/main.c -+++ subversion/svnsync/main.c -@@ -1,6 +1,6 @@ - /* - * ==================================================================== -- * Copyright (c) 2005-2008 CollabNet. All rights reserved. -+ * Copyright (c) 2005-2009 CollabNet. All rights reserved. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms -@@ -2362,7 +2362,15 @@ - check_cancel, NULL, - pool); - if (! err) -- err = (*subcommand->cmd_func)(os, &opt_baton, pool); -+ { -+ /* svnsync can safely create instance of QApplication class. */ -+ svn_auth_set_parameter(opt_baton.source_auth_baton, -+ "svn:auth:qapplication-safe", "1"); -+ svn_auth_set_parameter(opt_baton.sync_auth_baton, -+ "svn:auth:qapplication-safe", "1"); -+ -+ err = (*subcommand->cmd_func)(os, &opt_baton, pool); -+ } - if (err) - { - /* For argument-related problems, suggest using the 'help' diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch deleted file mode 100644 index e568b88a3f46..000000000000 --- a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/03/21 18:22:15 1303489 -+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -212,12 +215,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -289,12 +291,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch deleted file mode 100644 index 24b2834ab748..000000000000 --- a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- build-outputs.mk 2012-08-21 20:38:31.000000000 +0200 -+++ build-outputs.mk.new 2012-08-21 20:45:08.000000000 +0200 -@@ -825,7 +825,7 @@ - # Section 6: Install-Group build targets - ######################################## - --apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la -+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la - - bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la - -@@ -877,16 +877,17 @@ - - test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) - --tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) -+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) - - - ######################################## - # Section 7: Install-Group install targets - ######################################## - --install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la -+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la - cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la - cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la -+ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la - - install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la - $(MKDIR) $(DESTDIR)$(bdb_libdir) -@@ -1036,7 +1037,7 @@ - $(MKDIR) $(DESTDIR)$(swig_rb_libdir) - cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la - --install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la -+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) - $(MKDIR) $(DESTDIR)$(toolsdir) - cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) - cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) -@@ -1046,7 +1047,6 @@ - cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) - cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) - cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) -- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la - - - ######################################## diff --git a/dev-vcs/subversion/files/svnserve.initd b/dev-vcs/subversion/files/svnserve.initd deleted file mode 100644 index b1ed7e696a0d..000000000000 --- a/dev-vcs/subversion/files/svnserve.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd,v 1.1 2010/06/22 18:17:21 arfrever Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting svnserve" - # Ensure that we run from a readable working dir, and that we do not - # lock filesystems when being run from such a location. - cd / - start-stop-daemon --start --quiet --background --make-pidfile \ - --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ - --chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ - --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} - eend $? -} - -stop() { - ebegin "Stopping svnserve" - start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid - eend $? -} diff --git a/dev-vcs/subversion/subversion-1.8.9.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild index c45bb1671841..161f70f81e85 100644 --- a/dev-vcs/subversion/subversion-1.8.9.ebuild +++ b/dev-vcs/subversion/subversion-1.8.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.9.ebuild,v 1.15 2014/11/29 18:55:05 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.11.ebuild,v 1.1 2014/12/16 12:16:00 polynomial-c Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax" COMMON_DEPEND=">=dev-db/sqlite-3.7.12 @@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) - kde? ( kde-base/kwalletd ) + kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) ) nls? ( virtual/libintl ) perl? ( dev-perl/URI )" # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once @@ -58,7 +58,10 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE=" ctypes-python? ( ${PYTHON_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} )" + test? ( + ${PYTHON_REQUIRED_USE} + !dso + )" want_apache @@ -116,8 +119,7 @@ src_prepare() { "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \ "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \ "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \ - "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch \ - "${FILESDIR}"/${P}-po_fixes.patch + "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch epatch_user fperms +x build/transform_libtool_scripts.sh @@ -284,31 +286,33 @@ src_compile() { } src_test() { - if ! has_version ~${CATEGORY}/${P} ; then - ewarn "The test suite shows errors when there is an older version of" - ewarn "${CATEGORY}/${PN} installed." - fi - - default + if has_version ~${CATEGORY}/${P} ; then + default - if use ctypes-python ; then - python_test() { - "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ - || die "ctypes-python tests fail with ${EPYTHON}" - } + if use ctypes-python ; then + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" + } - distutils-r1_src_test - fi + distutils-r1_src_test + fi - if use python ; then - swig_py_test() { - pushd "${BUILD_DIR}" >/dev/null || die - "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" - popd >/dev/null || die - } + if use python ; then + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die + } - BUILD_DIR=subversion/bindings/swig/python \ - python_foreach_impl swig_py_test + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi + else + ewarn "The test suite shows errors when there is an older version of" + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." fi } @@ -363,7 +367,8 @@ src_install() { fi # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion subversion + newbashcomp tools/client-side/bash_completion svn + bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} rm -f tools/client-side/bash_completion # Install hot backup script, bug 54304. |