diff options
Diffstat (limited to 'dev-vcs/monotone')
-rw-r--r-- | dev-vcs/monotone/Manifest | 17 | ||||
-rw-r--r-- | dev-vcs/monotone/files/hooks.lua | 4 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-0.36.initd | 84 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-bash-completion-tests.patch | 18 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch | 92 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-botan-1.10-v2.patch | 644 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-gcc6.patch | 64 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-glibc-2.14-file-handle.patch | 166 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-pcre3.patch | 26 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone-1.0-texinfo-5.1.patch | 625 | ||||
-rw-r--r-- | dev-vcs/monotone/files/monotone.confd | 25 | ||||
-rw-r--r-- | dev-vcs/monotone/files/read-permissions | 7 | ||||
-rw-r--r-- | dev-vcs/monotone/files/write-permissions | 2 | ||||
-rw-r--r-- | dev-vcs/monotone/metadata.xml | 15 | ||||
-rw-r--r-- | dev-vcs/monotone/monotone-1.0-r4.ebuild | 116 |
15 files changed, 1905 insertions, 0 deletions
diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest new file mode 100644 index 000000000000..1dca44328e70 --- /dev/null +++ b/dev-vcs/monotone/Manifest @@ -0,0 +1,17 @@ +AUX hooks.lua 154 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326 SHA512 1244786898087edfe5c11493081c38d498c5ed275449b040caf4b9fbd1b3c15d238246c3d9c62cbfb5d0dd5f9a9ebac12a50ce6471fc245ede5c5e944bdb88e2 WHIRLPOOL 8d539f2aa64a85353da5653ec6987a7915a4eed0bea1f44a4b7bfac7c62e702f04ac94010309c8a5a8cc9040c733f9d42aab0c95edc3bd56549a91e2609f218c +AUX monotone-0.36.initd 2349 SHA256 9f188405c9c5e2a36311ba277e2a2380faedadd6eea108bd37cbdca0ed07d83a SHA512 3988aaebfe374bd07728cc2f2b3b01db30b4ca2d873ecc2f746fed6c662c6dd48fad1c6200dec6254f1aa580ebe7dc38eebdd8c98f17d173aedde9a68098a058 WHIRLPOOL bc20b9a999072c0f12d75cead0dc74afa689763190ee2cc1053cb1d681aa8a9de7cfef9cc57ba1f5bba4235cfada871da100f82f16d72ef87ce133753f0fd82e +AUX monotone-1.0-bash-completion-tests.patch 760 SHA256 bd5f78ccc627ab7f58d4b628c8bfbbaffe07e7ba8f5434d3ec823e8922aba401 SHA512 0c0ed67e668c28a8bd25624f420be72049f223e67f2686528a2899b47499661b972398ec3da891e1a55fbe69a2a0928812334c5741cb1391e3df04a9a49aaf7d WHIRLPOOL 85e0f269bf4ce310f31f74e25f1a5fb9c5eb24077a1dec3865e64a0a8f87633e60e464bbdb3b0c39219e201b3b718a1ca7221f4df2f9bfc68d54d5682350b9cd +AUX monotone-1.0-boost-1.53.patch 3768 SHA256 4a7e8135552cdb362416193a1e9f4fa5ef73a14c9974514c204d97b8c55740a2 SHA512 0ba422905701ddbab1c0d21d515079f686949d00d6579dd0578b45c1a05449b12a415209c327823739ed72a2f52f5d33735d293ef7c95d4a7f3afb22b80de33f WHIRLPOOL fa46fe37f993c1d133dc513d7a0f1b752797cc0fd56cae4969a7ab76ce3276d07f39cbbbbe9fb0e72d284fd3636a3b19534253bb4e2949a3802bf575ff936f69 +AUX monotone-1.0-botan-1.10-v2.patch 26290 SHA256 7455fdbc238d7ac461801e962bf6bcd6e147b050358ac24aa2280f0cb387ccc8 SHA512 f41f5c363cc6fd5a30582a1551a283ef7ad7c2c2450ff9c557fe3551dbe5184ba93ec88d9d9f7f3d4a7c678cf04043f23fa32d8c6bd837c05d5f11fdc9d661fd WHIRLPOOL b9261552fcf133f259db074d0dd973bbc6e7cc434733da4322746b5a461512481050c590a263bef5f0a185bd5656cb73d1d616b2d1a1808b06844cb7269ff34b +AUX monotone-1.0-gcc6.patch 2023 SHA256 1ea6e6415801b5c28b4bd6dfa5c23b7814d490d20a0ccd892353223c49b255e2 SHA512 5f8d6cd7aa659432a2d754dc0effcc42e37ff14d2f0856f11d6de87ac4c838fcb5486faeca3a18cb6e4d6dc2bce6c6370e4f2edb8e3c5b5702d785d7638e01c4 WHIRLPOOL e7ff7319a48f73bea60b6668eafc3c39b5bf1bd794693a0ea61b242daa56b60daa37e26903474d47dca2f484d2fa8434b59a159fb8bff964913480182204a6cf +AUX monotone-1.0-glibc-2.14-file-handle.patch 4132 SHA256 38ca0788f7e69e58e539e4b1acf95b95c4fa0dd1b5f0fcad3e4154774fc1c869 SHA512 b7855748d97855f8796cb663b97efaa23bc8c6032b1cfb61ef31acb9b7c97a1b8f66fef4a6aae226a740fd4352f322eb542dc2da4c6471233d48f29d18aa5d40 WHIRLPOOL 9d02ed8a13a4ef572f932b3cc4c366b5673bc2d5dbf2e826aeec03c65d438825d4841fb8e19b969cabc9c7f996405311509ea741191f0d87805a93da239b2bc4 +AUX monotone-1.0-pcre3.patch 1205 SHA256 2adf14d0b574abecfc84939abfd4285de62a323ba0e61d16c122e43e3295a824 SHA512 3b3d81bdeb1a253a25b29b6ee9a4c006d3d6a2d8c82c28ad51d4aebfc80ba5369b604259a0478bda0e11042769c809da65b3afda1ba25eefcf56af643ae6b932 WHIRLPOOL 681f2d73c40eb145c7797cd283007c731913f05d1aadcc37a7c8d65444f1520e0722dcd01d8b76b79a25f4a0056252095a8f43314b800b6e087fff9da09e46fd +AUX monotone-1.0-texinfo-5.1.patch 13044 SHA256 c2b1b70f3d8fd056424a0964b29819eafcd13448cf69c8506175b6a28e3cff3e SHA512 0ab25ead9aff99688408e01391758e5f5ba44c22cc0b7373000fd86f5013fb3d154a0f2ffd51cf6bbd838789be80baa56f0b128b4ce104ff118173ad1983f23f WHIRLPOOL b59d63daf48b3ea53f4672e35ee551a79e0a5f66afa71ece424fca3e4d1a7e8aa2525e7d9264850756d6fe5200f3521d4a4dc69f9bcd5e3c80155a245179b90a +AUX monotone.confd 692 SHA256 258cbe94db4265012050dff2e5eb1fce1d0c7d224eb6164ab533f098cd598015 SHA512 60cdc88a404a05a0a5be7c9d2ddd6020d502e98fe56462aca67c646d48bdf643989e32040ee2c8aa71f8742be2b3481d6c3b2757dc390ad4207d6437c3de5ed0 WHIRLPOOL 50aded0874103a0bf87ee2b2cffb07ee288ba96c6a2404a52b9564ecc067fb5d4313582725378cffb58ef0c4da3670359b8910df9edf33fe16a2fc60c8d27abe +AUX read-permissions 192 SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c SHA512 a86c6d7963e41f471de5c3c8538e0464364dffdaf8aee9890b833042c20b0a3a692e2262106f63fc7a669e2a9003d2a01aecb1d9a7632b432fdb828d1a42cdbd WHIRLPOOL 8bb1ec95c884000727a7f47dc3b558606c463eb0b1752838a1ca93d97a77c3cb44ebeb24d4af19cf0d67fa347ba13346c8c71f089785388a65721740a9baa0c8 +AUX write-permissions 32 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c SHA512 7348c621149d2911db11eb078ad39eb02ed3b51f4e1dd7ebc58dc863cfc0839e115c26d707c496138767f64e3987a4cc7dffb5eb711872a5d40fd8d084b9c08e WHIRLPOOL 3e04781c7637ecd08dea6e79d1f8e60eeb3d2617b6ec4c5e006ef873c480b63e4f27a1f753e1ba0805fb65ce52651fe8be48c4b5648e2aac4a8b724fe20082ca +DIST monotone-1.0.tar.bz2 3588074 SHA256 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc SHA512 85f5a015ee3f7a924e16b7f20974cadd18bd6aaf2815eca0da42689373fc654c661051ce6981ec473f9eac7f9796cfed3431f0cfe16d1cbe0b0b625302ef3e77 WHIRLPOOL c0379f4e37fc6dc8f47caf4b548f7ef124cdf3f7a87fccb3a4cc6d160bcff4092a4d9636d71558120c9e28ef072bcf5dd23d6e116ad49abb6c99a9886d1747df +EBUILD monotone-1.0-r4.ebuild 3447 SHA256 e06090d259e14b934893f5374be4fa6e0b5551486192bfffdd4c631f1793c667 SHA512 ba79b156b35bfec033471a3123649b8f6b7b2586e66bf83502039d196343bff82b90a64a43279fbe150658e1f516cc0e773c81c1c8599daec938517fdfa15e78 WHIRLPOOL c14ee718c5fb1ed752b727a09c69c9fde6602b7cfd173e8468b74eea7338907aea92e017261b0d5d491f23bfc72a6b2b42546f14bd4730f42b8f97780ca964ba +MISC ChangeLog 3296 SHA256 090c7ab1641818f4772061c86a4644e5e5e395b514c1c22c9300793364777d9c SHA512 1b452d768f11d2fbe4ed07a9bb691325da257b985e6e58431c6233e63779e97666ceded9e27afa2ceb8edc02f084b32da10217324f368dc273622cfa2c71033e WHIRLPOOL 9138be6b45177a8158dc2b2274475ef9fa9662c0b3c8eb7d18e6283f54bb64f24c9748c934868ef987ea83e4328a5310b1654ee06fab037b2353a2e5a5f11873 +MISC ChangeLog-2015 16612 SHA256 e33e21bdf5ad835afb27eed29ce9b69da579e4c75ba879c527dab25de1f29a78 SHA512 bf7969716cfb1d3323a4c9a51e51d2cbdf64bf11d6f96a10c3f18b249f980a5a4df4d735b027e9bef5c0a8071a2ec17cf260bd63e6bea38a070d4a1e04334183 WHIRLPOOL 542e0a0efa8eb3b76e0b76b56aba19a6891ddccf69d4bbadd2f28f93934956d71faf9449e06092fd41405bf0a2162c25dd144bb8ba31035866c6a7d565195cc7 +MISC metadata.xml 744 SHA256 7329ed6b4b213e4caad0740c3a5e1c7fe0db15c6556482c7bbef520e1377471d SHA512 98df2fa2eaa8cfd42f3de02082c815e37d69d05ddddd00f79ecd7a2c1c85f948663924ab6f4712903c103d2d4a525e121318e22bb0b2882c49218bd695b9de0e WHIRLPOOL cfbd490529fdc5a057b68eb5c665214180a34cc6919e47732e56cef4e6c34d56ac4abe4f8b6b7204e3c5df0d9df7ac17e42c6c866073b128852c530eafa7b711 diff --git a/dev-vcs/monotone/files/hooks.lua b/dev-vcs/monotone/files/hooks.lua new file mode 100644 index 000000000000..bbdb0042a5f6 --- /dev/null +++ b/dev-vcs/monotone/files/hooks.lua @@ -0,0 +1,4 @@ +-- Add custom hooks after the following line. It includes the identification +-- needed to start the server. + +include(get_confdir() .. "/passphrase.lua") diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd new file mode 100644 index 000000000000..286264c5f772 --- /dev/null +++ b/dev-vcs/monotone/files/monotone-0.36.initd @@ -0,0 +1,84 @@ +#!/sbin/openrc-run +# Copyright 2006-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +extra_commands="import" + +depend() { + need net +} + +# Substitute common default values +MTN_USER=${MTN_USER:-monotone} +MTN_GROUP=${MTN_GROUP:-monotone} +MTN_KEY=${MTN_KEY:-monotone@`hostname --fqdn`} +MTN_CONFDIR=${MTN_CONFDIR:-/etc/monotone} +MTN_COMMON="--norc --confdir=${MTN_CONFDIR} \ + --keydir=${MTN_KEYDIR:-/var/lib/monotone/keys} \ + --db=${MTN_DB:-/var/lib/monotone/default.mtn} \ + --rcfile=${MTN_CONFDIR}/hooks.lua --log=/var/log/monotone/monotone.log" + #--dump=$ERRORLOG +MTN_PIDFILE="/var/run/monotone/monotone.pid" +MTN_HOME=$(awk -F: -vuid=$MTN_USER -vuser=$MTN_USER '$3 == uid || $1 == user { print $6 }' < /etc/passwd) + +dbexists() { + # Create the database if it doesn't exist + if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then + ebegin "Creating monotone database" + start-stop-daemon --start \ + --user ${MTN_USER} --group ${MTN_GROUP} \ + --exec /usr/bin/mtn -- ${MTN_COMMON} db init + eend $? + fi + if [ ! -e ${MTN_KEYDIR:-/var/lib/monotone/keys}/${MTN_KEY} ]; then + ebegin "Creating monotone server keypair" + export MTN_PWD=${RANDOM} + yes "${MTN_PWD}" | \ + start-stop-daemon --start \ + --user ${MTN_USER} --group ${MTN_GROUP} \ + --exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY} + + eend $? + # Update the password lua hook + cat > ${MTN_CONFDIR}/passphrase.lua <<EOF +-- This file is automaticaly generated by the init scripts. +-- If you want to add custom hooks, edit ${MTN_CONFDIR}/hooks.lua +-- If you want to change the settings, please edit /etc/conf.d/monotone + +function get_passphrase(identity) + if (identity == "${MTN_KEY}") then + return "${MTN_PWD}" + end + return false +end +EOF + fi +} + +start() { + cd ${MTN_HOME} + dbexists + + ebegin "Starting monotone server" + start-stop-daemon --start --background \ + --user ${MTN_USER} --group ${MTN_GROUP} \ + --exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \ + --key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve + eend $? +} + +stop() { + ebegin "Stopping monotone server" + start-stop-daemon --stop --quiet --pidfile ${MTN_PIDFILE} + eend $? +} + +import() { + cd ${MTN_HOME} + dbexists + + # Read packets into the database + einfo "Importing packets to monotone database" + cat | /usr/bin/mtn ${MTN_COMMON} read + eend $? +} diff --git a/dev-vcs/monotone/files/monotone-1.0-bash-completion-tests.patch b/dev-vcs/monotone/files/monotone-1.0-bash-completion-tests.patch new file mode 100644 index 000000000000..5b877d4d31cd --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-bash-completion-tests.patch @@ -0,0 +1,18 @@ +https://code.monotone.ca/p/monotone/issues/180/ +--- test/extra/bash_completion/bashrc 2011-09-07 09:00:12 +0000 ++++ test/extra/bash_completion/bashrc 2011-09-07 12:14:59 +0000 +@@ -18,6 +18,13 @@ + . /etc/bash_completion + elif [ -f /usr/local/etc/bash_completion ]; then + . /usr/local/etc/bash_completion ++ elif [ -f /usr/share/bash-completion/.pre -a \ ++ -f /usr/share/bash-completion/base ]; then ++ # In Gentoo /etc/profile.d/bash-completion.sh sources required ++ # functions only if enabled with `eselect bashcomp`. We source ++ # required definitions manually. ++ source /usr/share/bash-completion/.pre ++ source /usr/share/bash-completion/base + else + echo No bash completion package present. + exit + diff --git a/dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch b/dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch new file mode 100644 index 000000000000..e72a57e4cdee --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-boost-1.53.patch @@ -0,0 +1,92 @@ +============================================================ +--- src/database.cc 87efeeff2d3263ba98af684a4022f1897434ed2d ++++ src/database.cc 39ab2644b936e09a536b99ebd28b93f6e0d7c162 +@@ -92,7 +92,7 @@ using boost::shared_ptr; + using std::accumulate; + + using boost::shared_ptr; +-using boost::shared_dynamic_cast; ++using boost::dynamic_pointer_cast; + using boost::lexical_cast; + using boost::get; + using boost::tuple; +@@ -3430,7 +3430,7 @@ database::encrypt_rsa(key_id const & pub + + shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); + shared_ptr<RSA_PublicKey> pub_key +- = shared_dynamic_cast<RSA_PublicKey>(x509_key); ++ = dynamic_pointer_cast<RSA_PublicKey>(x509_key); + if (!pub_key) + throw recoverable_failure(origin::system, + "Failed to get RSA encrypting key"); +@@ -3481,7 +3481,7 @@ database::check_signature(key_id const & + L(FL("building verifier for %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); + shared_ptr<RSA_PublicKey> pub_key +- = boost::shared_dynamic_cast<RSA_PublicKey>(x509_key); ++ = boost::dynamic_pointer_cast<RSA_PublicKey>(x509_key); + + E(pub_key, id.inner().made_from, + F("failed to get RSA verifying key for %s") % id); +============================================================ +--- src/key_store.cc b7859345f7c665914d16357409bdff24a48b7996 ++++ src/key_store.cc 1ca13b7ee527bc2872d9fc325cf5ef327ca053c2 +@@ -43,7 +43,7 @@ using boost::shared_ptr; + + using boost::scoped_ptr; + using boost::shared_ptr; +-using boost::shared_dynamic_cast; ++using boost::dynamic_pointer_cast; + + using Botan::RSA_PrivateKey; + using Botan::RSA_PublicKey; +@@ -641,7 +641,7 @@ key_store_state::decrypt_private_key(key + I(pkcs8_key); + + shared_ptr<RSA_PrivateKey> priv_key; +- priv_key = shared_dynamic_cast<RSA_PrivateKey>(pkcs8_key); ++ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(pkcs8_key); + E(priv_key, origin::no_fault, + F("failed to extract RSA private key from PKCS#8 keypair")); + +@@ -879,7 +879,8 @@ key_store::make_signature(database & db, + L(FL("make_signature: building %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key = + shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); +- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key); ++ shared_ptr<RSA_PublicKey> pub_key = ++ dynamic_pointer_cast<RSA_PublicKey>(x509_key); + + if (!pub_key) + throw recoverable_failure(origin::system, +@@ -1092,7 +1093,7 @@ key_store_state::migrate_old_key_pair + continue; + } + +- priv_key = shared_dynamic_cast<RSA_PrivateKey>(pkcs8_key); ++ priv_key = dynamic_pointer_cast<RSA_PrivateKey>(pkcs8_key); + I(priv_key); + + // now we can write out the new key +============================================================ +--- src/ssh_agent.cc 4a0dcab873559e934e41c5f220b5434d35600d9b ++++ src/ssh_agent.cc 6313ee3cdfca4112ba3957dc4a5f318472289dfa +@@ -32,7 +32,7 @@ using boost::shared_ptr; + using std::vector; + + using boost::shared_ptr; +-using boost::shared_dynamic_cast; ++using boost::dynamic_pointer_cast; + + using Botan::RSA_PublicKey; + using Botan::RSA_PrivateKey; +@@ -391,7 +391,8 @@ ssh_agent::has_key(const keypair & key) + L(FL("has_key: building %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key = + shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); +- shared_ptr<RSA_PublicKey> pub_key = shared_dynamic_cast<RSA_PublicKey>(x509_key); ++ shared_ptr<RSA_PublicKey> pub_key = ++ dynamic_pointer_cast<RSA_PublicKey>(x509_key); + + if (!pub_key) + throw recoverable_failure(origin::system, diff --git a/dev-vcs/monotone/files/monotone-1.0-botan-1.10-v2.patch b/dev-vcs/monotone/files/monotone-1.0-botan-1.10-v2.patch new file mode 100644 index 000000000000..a86bac555b18 --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-botan-1.10-v2.patch @@ -0,0 +1,644 @@ +Make monotone work with botan 1.10. + +Patch generated using the following command: +mtn diff -r 972ee5c3eab3fb5ba0b80684193293d18438a9d0 \ + -r f4feb3fdc68e4f955909450b2dcb3ff9312dbc9e + +Authors: Martin von Gagern, Markus Wanner + +References: +https://bugs.gentoo.org/380257 +https://code.monotone.ca/p/monotone/issues/182/ +https://code.monotone.ca/p/monotone/source/commit/f4feb3fd + +============================================================ +--- src/database.cc 4c259f963c440fc95564dfec99b2f832f0bad643 ++++ src/database.cc 87efeeff2d3263ba98af684a4022f1897434ed2d +@@ -3425,9 +3425,8 @@ database::encrypt_rsa(key_id const & pub + rsa_pub_key pub; + get_key(pub_id, pub); + +- SecureVector<Botan::byte> pub_block; +- pub_block.set(reinterpret_cast<Botan::byte const *>(pub().data()), +- pub().size()); ++ SecureVector<Botan::byte> pub_block ++ (reinterpret_cast<Botan::byte const *>(pub().data()), pub().size()); + + shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); + shared_ptr<RSA_PublicKey> pub_key +@@ -3471,14 +3470,13 @@ database::check_signature(key_id const & + else + { + rsa_pub_key pub; +- SecureVector<Botan::byte> pub_block; + + if (!public_key_exists(id)) + return cert_unknown; + + get_key(id, pub); +- pub_block.set(reinterpret_cast<Botan::byte const *>(pub().data()), +- pub().size()); ++ SecureVector<Botan::byte> pub_block ++ (reinterpret_cast<Botan::byte const *>(pub().data()), pub().size()); + + L(FL("building verifier for %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key(Botan::X509::load_key(pub_block)); +============================================================ +--- src/gzip.cc e7c19bee910e3d421fd073933810ec52092b1d9b ++++ src/gzip.cc 9da41f6820cdf39707b22c716e3682e0fa0fd745 +@@ -110,7 +110,7 @@ Gzip_Compression::Gzip_Compression(u32bi + if(deflateInit2(&(zlib->stream), level, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) + { + delete zlib; zlib = 0; +- throw Exception("Gzip_Compression: Memory allocation error"); ++ throw Memory_Exhaustion(); + } + } + +@@ -137,7 +137,7 @@ void Gzip_Compression::start_msg() + /************************************************* + * Compress Input with Gzip * + *************************************************/ +-void Gzip_Compression::write(const byte input[], u32bit length) ++void Gzip_Compression::write(const byte input[], filter_length_t length) + { + + count += length; +@@ -152,7 +152,7 @@ void Gzip_Compression::write(const byte + zlib->stream.avail_out = buffer.size(); + int rc = deflate(&(zlib->stream), Z_NO_FLUSH); + if (rc != Z_OK && rc != Z_STREAM_END) +- throw Exception("Internal error in Gzip_Compression deflate."); ++ throw Invalid_State("Internal error in Gzip_Compression deflate."); + send(buffer.begin(), buffer.size() - zlib->stream.avail_out); + } + } +@@ -172,7 +172,7 @@ void Gzip_Compression::end_msg() + zlib->stream.avail_out = buffer.size(); + rc = deflate(&(zlib->stream), Z_FINISH); + if (rc != Z_OK && rc != Z_STREAM_END) +- throw Exception("Internal error in Gzip_Compression finishing deflate."); ++ throw Invalid_State("Internal error in Gzip_Compression finishing deflate."); + send(buffer.begin(), buffer.size() - zlib->stream.avail_out); + } + +@@ -228,7 +228,7 @@ Gzip_Decompression::Gzip_Decompression() + no_writes(true), pipe(new Hash_Filter("CRC32")), footer(0) + { + if (DEFAULT_BUFFERSIZE < sizeof(GZIP::GZIP_HEADER)) +- throw Exception("DEFAULT_BUFFERSIZE is too small"); ++ throw Decoding_Error("DEFAULT_BUFFERSIZE is too small"); + + zlib = new Zlib_Stream; + +@@ -237,7 +237,7 @@ Gzip_Decompression::Gzip_Decompression() + if(inflateInit2(&(zlib->stream), -15) != Z_OK) + { + delete zlib; zlib = 0; +- throw Exception("Gzip_Decompression: Memory allocation error"); ++ throw Memory_Exhaustion(); + } + } + +@@ -256,7 +256,7 @@ void Gzip_Decompression::start_msg() + void Gzip_Decompression::start_msg() + { + if (!no_writes) +- throw Exception("Gzip_Decompression: start_msg after already writing"); ++ throw Decoding_Error("Gzip_Decompression: start_msg after already writing"); + + pipe.start_msg(); + datacount = 0; +@@ -267,7 +267,7 @@ void Gzip_Decompression::start_msg() + /************************************************* + * Decompress Input with Gzip * + *************************************************/ +-void Gzip_Decompression::write(const byte input[], u32bit length) ++void Gzip_Decompression::write(const byte input[], filter_length_t length) + { + if(length) no_writes = false; + +@@ -277,15 +277,16 @@ void Gzip_Decompression::write(const byt + u32bit eat_len = eat_footer(input, length); + input += eat_len; + length -= eat_len; +- if (length == 0) +- return; + } + ++ if (length == 0) ++ return; ++ + // Check the gzip header + if (pos < sizeof(GZIP::GZIP_HEADER)) + { +- u32bit len = std::min((u32bit)sizeof(GZIP::GZIP_HEADER)-pos, length); +- u32bit cmplen = len; ++ filter_length_t len = std::min((filter_length_t)sizeof(GZIP::GZIP_HEADER)-pos, length); ++ filter_length_t cmplen = len; + // The last byte is the OS flag - we don't care about that + if (pos + len - 1 >= GZIP::HEADER_POS_OS) + cmplen--; +@@ -317,8 +318,8 @@ void Gzip_Decompression::write(const byt + if(rc == Z_NEED_DICT) + throw Decoding_Error("Gzip_Decompression: Need preset dictionary"); + if(rc == Z_MEM_ERROR) +- throw Exception("Gzip_Decompression: Memory allocation error"); +- throw Exception("Gzip_Decompression: Unknown decompress error"); ++ throw Memory_Exhaustion(); ++ throw Decoding_Error("Gzip_Decompression: Unknown decompress error"); + } + send(buffer.begin(), buffer.size() - zlib->stream.avail_out); + pipe.write(buffer.begin(), buffer.size() - zlib->stream.avail_out); +@@ -346,8 +347,14 @@ u32bit Gzip_Decompression::eat_footer(co + if (footer.size() >= GZIP::FOOTER_LENGTH) + throw Decoding_Error("Gzip_Decompression: Data integrity error in footer"); + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ size_t eat_len = std::min(GZIP::FOOTER_LENGTH-footer.size(), ++ static_cast<size_t>(length)); ++ footer += std::make_pair(input, eat_len); ++#else + u32bit eat_len = std::min(GZIP::FOOTER_LENGTH-footer.size(), length); + footer.append(input, eat_len); ++#endif + + if (footer.size() == GZIP::FOOTER_LENGTH) + { +@@ -364,7 +371,7 @@ void Gzip_Decompression::check_footer() + void Gzip_Decompression::check_footer() + { + if (footer.size() != GZIP::FOOTER_LENGTH) +- throw Exception("Gzip_Decompression: Error finalizing decompression"); ++ throw Decoding_Error("Gzip_Decompression: Error finalizing decompression"); + + pipe.end_msg(); + +@@ -377,7 +384,12 @@ void Gzip_Decompression::check_footer() + for (int i = 0; i < 4; i++) + buf[3-i] = tmpbuf[i]; + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ tmpbuf.resize(4); ++ tmpbuf.copy(footer.begin(), 4); ++#else + tmpbuf.set(footer.begin(), 4); ++#endif + if (buf != tmpbuf) + throw Decoding_Error("Gzip_Decompression: Data integrity error - CRC32 error"); + +@@ -400,7 +412,7 @@ void Gzip_Decompression::end_msg() + // read, clear() will reset no_writes + if(no_writes) return; + +- throw Exception("Gzip_Decompression: didn't find footer"); ++ throw Decoding_Error("Gzip_Decompression: didn't find footer"); + + } + +@@ -412,7 +424,11 @@ void Gzip_Decompression::clear() + no_writes = true; + inflateReset(&(zlib->stream)); + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ footer.clear(); ++#else + footer.destroy(); ++#endif + pos = 0; + datacount = 0; + } +============================================================ +--- src/gzip.hh 649dfc0b250954f39c0f73870f8bec3f32f7fa43 ++++ src/gzip.hh aff9da63bb22366bccf69c2d75ee7790406d2455 +@@ -7,11 +7,18 @@ + #ifndef BOTAN_EXT_GZIP_H__ + #define BOTAN_EXT_GZIP_H__ + ++#include <botan/version.h> + #include <botan/filter.h> + #include <botan/pipe.h> + + namespace Botan { + ++#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,4) ++// Only 1.9.4 and newer export the Memory_Exception. Give this gzip ++// implementation something compatible to work with. ++typedef std::bad_alloc Memory_Exhaustion; ++#endif ++ + namespace GZIP { + + /* A basic header - we only need to set the IDs and compression method */ +@@ -30,13 +37,19 @@ namespace GZIP { + + } + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++typedef size_t filter_length_t; ++#else ++typedef u32bit filter_length_t; ++#endif ++ + /************************************************* + * Gzip Compression Filter * + *************************************************/ + class Gzip_Compression : public Filter + { + public: +- void write(const byte input[], u32bit length); ++ void write(const byte input[], filter_length_t length); + void start_msg(); + void end_msg(); + std::string name() const { return "Gzip_Compression"; } +@@ -60,7 +73,7 @@ class Gzip_Decompression : public Filter + class Gzip_Decompression : public Filter + { + public: +- void write(const byte input[], u32bit length); ++ void write(const byte input[], filter_length_t length); + void start_msg(); + void end_msg(); + std::string name() const { return "Gzip_Decompression"; } +============================================================ +--- src/key_packet.cc d1306df89dd684badac02c03744cd446381c07d3 ++++ src/key_packet.cc c97262d161b23c9640972188979669b3e95afe7b +@@ -106,8 +106,8 @@ namespace + void validate_public_key_data(string const & name, string const & keydata) const + { + string decoded = decode_base64_as<string>(keydata, origin::user); +- Botan::SecureVector<Botan::byte> key_block; +- key_block.set(reinterpret_cast<Botan::byte const *>(decoded.c_str()), decoded.size()); ++ Botan::SecureVector<Botan::byte> key_block ++ (reinterpret_cast<Botan::byte const *>(decoded.c_str()), decoded.size()); + try + { + Botan::X509::load_key(key_block); +============================================================ +--- src/key_store.cc 64c4c4bed1fadc26b51207b9f61343f9dd7d3c6e ++++ src/key_store.cc b7859345f7c665914d16357409bdff24a48b7996 +@@ -572,13 +572,21 @@ key_store_state::decrypt_private_key(key + try // with empty passphrase + { + Botan::DataSource_Memory ds(kp.priv()); +-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ pkcs8_key.reset(Botan::PKCS8::load_key(ds, lazy_rng::get(), Dummy_UI())); ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) + pkcs8_key.reset(Botan::PKCS8::load_key(ds, lazy_rng::get(), "")); + #else + pkcs8_key.reset(Botan::PKCS8::load_key(ds, "")); + #endif + } ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ catch (Passphrase_Required & e) ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,4) ++ catch (Botan::Invalid_Argument & e) ++#else + catch (Botan::Exception & e) ++#endif + { + L(FL("failed to load key with no passphrase: %s") % e.what()); + +@@ -605,13 +613,18 @@ key_store_state::decrypt_private_key(key + { + Botan::DataSource_Memory ds(kp.priv()); + #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) +- pkcs8_key.reset(Botan::PKCS8::load_key(ds, lazy_rng::get(), phrase())); ++ pkcs8_key.reset(Botan::PKCS8::load_key(ds, lazy_rng::get(), ++ phrase())); + #else + pkcs8_key.reset(Botan::PKCS8::load_key(ds, phrase())); + #endif + break; + } ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,4) ++ catch (Botan::Invalid_Argument) ++#else + catch (Botan::Exception & e) ++#endif + { + cycles++; + L(FL("decrypt_private_key: failure %d to load encrypted key: %s") +@@ -822,10 +835,14 @@ key_store::decrypt_rsa(key_id const & id + plaintext = string(reinterpret_cast<char const*>(plain.begin()), + plain.size()); + } +- catch (Botan::Exception & ex) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,4) ++ catch (std::exception & e) ++#else ++ catch (Botan::Exception & e) ++#endif + { + E(false, ciphertext.made_from, +- F("Botan error decrypting data: '%s'") % ex.what()); ++ F("Botan error decrypting data: '%s'") % e.what()); + } + } + +@@ -856,9 +873,9 @@ key_store::make_signature(database & db, + { + if (agent.connected()) { + //grab the monotone public key as an RSA_PublicKey +- SecureVector<Botan::byte> pub_block; +- pub_block.set(reinterpret_cast<Botan::byte const *>(key.pub().data()), +- key.pub().size()); ++ SecureVector<Botan::byte> pub_block ++ (reinterpret_cast<Botan::byte const *>(key.pub().data()), ++ key.pub().size()); + L(FL("make_signature: building %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key = + shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); +@@ -1031,8 +1048,14 @@ key_store_state::migrate_old_key_pair + for (;;) + try + { ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ arc4_key.resize(phrase().size()); ++ arc4_key.copy(reinterpret_cast<Botan::byte const *>(phrase().data()), ++ phrase().size()); ++#else + arc4_key.set(reinterpret_cast<Botan::byte const *>(phrase().data()), + phrase().size()); ++#endif + + Pipe arc4_decryptor(get_cipher("ARC4", arc4_key, Botan::DECRYPTION)); + +@@ -1051,7 +1074,11 @@ key_store_state::migrate_old_key_pair + #endif + break; + } ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,4) ++ catch (Botan::Invalid_Argument & e) ++#else + catch (Botan::Exception & e) ++#endif + { + L(FL("migrate_old_key_pair: failure %d to load old private key: %s") + % cycles % e.what()); +============================================================ +--- src/monotone.cc a25ecdd170a601db798b63a60add7681609a34c4 ++++ src/monotone.cc 764bc9ca406b41d21efd552a0d810bc2849e0588 +@@ -156,27 +156,53 @@ cpp_main(int argc, char ** argv) + E(linked_botan_version != BOTAN_VERSION_CODE_FOR(1,7,14), origin::system, + F("monotone does not support Botan 1.7.14")); + +-#if BOTAN_VERSION_CODE <= BOTAN_VERSION_CODE_FOR(1,7,6) ++ // In Botan 1.9.9, the DataSink_Stream cannot be instantiated per ++ // se. As 1.10.1 is already out, let's simply disable support for ++ // that specific (testing) version of botan. ++ E(linked_botan_version != BOTAN_VERSION_CODE_FOR(1,9,9), origin::system, ++ F("monotone does not support Botan 1.9.9")); ++ ++#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,7,7) ++ // motonote binary compiled against botan younger than 1.7.7 + E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,6,3), origin::system, + F("this monotone binary requires Botan 1.6.3 or newer")); +- E(linked_botan_version <= BOTAN_VERSION_CODE_FOR(1,7,6), origin::system, +- F("this monotone binary does not work with Botan newer than 1.7.6")); +-#elif BOTAN_VERSION_CODE <= BOTAN_VERSION_CODE_FOR(1,7,22) +- E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,6), origin::system, ++ E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,7,7), origin::system, ++ F("this monotone binary does not work with Botan 1.7.7 or newer")); ++ ++#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,7,22) ++ // motonote binary compiled against botan 1.7.7 - 1.7.21 ++ E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,7,7), origin::system, + F("this monotone binary requires Botan 1.7.7 or newer")); +- // While compiling against 1.7.22 or newer is recommended, because +- // it enables new features of Botan, the monotone binary compiled +- // against Botan 1.7.21 and before should still work with newer Botan +- // versions, including all of the stable branch 1.8.x. +- E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system, +- F("this monotone binary does not work with Botan 1.9.x")); +-#else +- E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), origin::system, ++ // While compiling against 1.7.22 or newer is recommended, because it ++ // enables new features of Botan, the monotone binary compiled against ++ // Botan 1.7.21 and before should still work with newer Botan version, ++ // including all of the stable branch 1.8.x, up to and including ++ // 1.9.3. ++ E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,4), origin::system, ++ F("this monotone binary does not work with Botan 1.9.4 or newer")); ++ ++#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,4) ++ // motonote binary compiled against botan 1.7.22 - 1.9.3 ++ E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,7,22), origin::system, + F("this monotone binary requires Botan 1.7.22 or newer")); +- E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system, +- F("this monotone binary does not work with Botan 1.9.x")); ++ E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,4), origin::system, ++ F("this monotone binary does not work with Botan 1.9.4 or newer")); ++ ++#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,11) ++ // motonote binary compiled against botan 1.9.4 - 1.9.10 ++#pragma message ( "The resulting monotone binary won't be able to run with any stable release of botan." ) ++ E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,9,4), origin::system, ++ F("this monotone binary requires Botan 1.9.4 or newer")); ++ E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,11), origin::system, ++ F("this monotone binary does not work with Botan 1.9.11 or newer")); ++ ++#else ++ // motonote binary compiled against botan 1.9.11 and newer ++ E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,9,11), origin::system, ++ F("this monotone binary requires Botan 1.9.11 or newer")); + #endif + ++ + app_state app; + try + { +============================================================ +--- src/packet.cc f61360ed2524fdf53411bd24d022a2a3c9e6e9c7 ++++ src/packet.cc 571ff6eae1d269a146da74f2730b70376957d3bb +@@ -156,8 +156,8 @@ namespace + void validate_public_key_data(string const & name, string const & keydata) const + { + string decoded = decode_base64_as<string>(keydata, origin::user); +- Botan::SecureVector<Botan::byte> key_block; +- key_block.set(reinterpret_cast<Botan::byte const *>(decoded.c_str()), decoded.size()); ++ Botan::SecureVector<Botan::byte> key_block ++ (reinterpret_cast<Botan::byte const *>(decoded.c_str()), decoded.size()); + try + { + Botan::X509::load_key(key_block); +@@ -175,7 +175,9 @@ namespace + Botan::DataSource_Memory ds(decoded); + try + { +-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ Botan::PKCS8::load_key(ds, lazy_rng::get(), Dummy_UI()); ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7) + Botan::PKCS8::load_key(ds, lazy_rng::get(), string()); + #else + Botan::PKCS8::load_key(ds, string()); +@@ -189,7 +191,11 @@ namespace + } + // since we do not want to prompt for a password to decode it finally, + // we ignore all other exceptions ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++ catch (Passphrase_Required) {} ++#else + catch (Botan::Invalid_Argument) {} ++#endif + } + void validate_certname(string const & cn) const + { +@@ -460,8 +466,16 @@ read_packets(istream & in, packet_consum + return count; + } + ++// Dummy User_Interface implementation for Botan ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++std::string ++Dummy_UI::get_passphrase(const std::string &, const std::string &, ++ Botan::User_Interface::UI_Result&) const ++{ ++ throw Passphrase_Required("Passphrase required"); ++} ++#endif + +- + // Local Variables: + // mode: C++ + // fill-column: 76 +============================================================ +--- src/packet.hh 0a224e6e92f244e2c3e9a5cdb935eb8613d7e85b ++++ src/packet.hh 9c43d30145f0292d6ceda5e717e366fdead5a4d6 +@@ -10,6 +10,10 @@ + #ifndef __PACKET_HH__ + #define __PACKET_HH__ + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++#include <botan/ui.h> ++#endif ++ + #include "vocab.hh" + + struct cert; +@@ -84,8 +88,23 @@ size_t read_packets(std::istream & in, p + + size_t read_packets(std::istream & in, packet_consumer & cons); + ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,9,11) ++// A helper class implementing Botan::User_Interface - which doesn't really ++// interface with the user, but provides the necessary plumbing for Botan. ++// ++// See Botan commit 2d09d7d0cd4bd0e7155d001dd65a4f29103b158c ++typedef std::runtime_error Passphrase_Required; ++ ++class Dummy_UI : public Botan::User_Interface ++{ ++public: ++ virtual std::string get_passphrase(const std::string &, const std::string &, ++ Botan::User_Interface::UI_Result &) const; ++}; + #endif + ++#endif ++ + // Local Variables: + // mode: C++ + // fill-column: 76 +============================================================ +--- src/sha1.cc 5e1aa972d7c7d66e06320b039989652b830dcd75 ++++ src/sha1.cc 42e48b22fd88b25e0d38d4f91e1f13f8a83c7120 +@@ -50,9 +50,12 @@ CMD_HIDDEN(benchmark_sha1, "benchmark_sh + Botan::Default_Benchmark_Timer timer; + std::map<std::string, double> results = + Botan::algorithm_benchmark("SHA-1", milliseconds, timer, rng, af); ++#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,9,11) ++ std::map<std::string, double> results = ++ Botan::algorithm_benchmark("SHA-1", milliseconds, rng, af); + #else + std::map<std::string, double> results = +- Botan::algorithm_benchmark("SHA-1", milliseconds, rng, af); ++ Botan::algorithm_benchmark("SHA-1", af, rng, milliseconds, 16); + #endif + + for(std::map<std::string, double>::const_iterator i = results.begin(); +============================================================ +--- src/ssh_agent.cc 6d188e7012a0b82f782563b09bbd7adf3f70cf75 ++++ src/ssh_agent.cc 4a0dcab873559e934e41c5f220b5434d35600d9b +@@ -385,9 +385,9 @@ ssh_agent::has_key(const keypair & key) + ssh_agent::has_key(const keypair & key) + { + //grab the monotone public key as an RSA_PublicKey +- SecureVector<Botan::byte> pub_block; +- pub_block.set(reinterpret_cast<Botan::byte const *>((key.pub)().data()), +- (key.pub)().size()); ++ SecureVector<Botan::byte> pub_block ++ (reinterpret_cast<Botan::byte const *>((key.pub)().data()), ++ (key.pub)().size()); + L(FL("has_key: building %d-byte pub key") % pub_block.size()); + shared_ptr<X509_PublicKey> x509_key = + shared_ptr<X509_PublicKey>(Botan::X509::load_key(pub_block)); +============================================================ +--- src/transforms.cc cdfb6854ef4992faba21074145f3c8269b845b11 ++++ src/transforms.cc b99278ffe95c0081bf4986bc74d3699c37a52948 +@@ -53,15 +53,16 @@ using Botan::Hash_Filter; + // paradigm "must" be used. this program is intended for source code + // control and I make no bones about it. + +-NORETURN(static inline void error_in_transform(Botan::Exception & e)); ++NORETURN(static inline void error_in_transform(std::exception & e)); + + static inline void +-error_in_transform(Botan::Exception & e, origin::type caused_by) ++error_in_transform(std::exception & e, origin::type caused_by) + { + // these classes can all indicate data corruption + if (typeid(e) == typeid(Botan::Encoding_Error) + || typeid(e) == typeid(Botan::Decoding_Error) + || typeid(e) == typeid(Botan::Stream_IO_Error) ++ || typeid(e) == typeid(Botan::Invalid_Argument) + || typeid(e) == typeid(Botan::Integrity_Failure)) + { + // clean up the what() string a little: throw away the +@@ -107,7 +108,7 @@ error_in_transform(Botan::Exception & e, + pipe->process_msg(in); \ + out = pipe->read_all_as_string(Pipe::LAST_MESSAGE); \ + } \ +- catch (Botan::Exception & e) \ ++ catch (std::exception & e) \ + { \ + pipe.reset(new Pipe(new T(carg))); \ + error_in_transform(e, made_from); \ +@@ -173,7 +174,7 @@ template<> string xform<Botan::Hex_Decod + { + throw Botan::Decoding_Error(string("invalid hex character '") + (char)c + "'"); + } +- catch(Botan::Exception & e) ++ catch(std::exception & e) + { + error_in_transform(e, made_from); + } +@@ -219,7 +220,7 @@ void pack(T const & in, base64< gzip<T> + tmp = pipe->read_all_as_string(Pipe::LAST_MESSAGE); + out = base64< gzip<T> >(tmp, in.made_from); + } +- catch (Botan::Exception & e) ++ catch (std::exception & e) + { + pipe.reset(new Pipe(new Gzip_Compression, + new Base64_Encoder)); +@@ -237,7 +238,7 @@ void unpack(base64< gzip<T> > const & in + pipe->process_msg(in()); + out = T(pipe->read_all_as_string(Pipe::LAST_MESSAGE), in.made_from); + } +- catch (Botan::Exception & e) ++ catch (std::exception & e) + { + pipe.reset(new Pipe(new Base64_Decoder, + new Gzip_Decompression)); +@@ -264,7 +265,7 @@ calculate_ident(data const & dat, + p->process_msg(dat()); + ident = id(p->read_all_as_string(Pipe::LAST_MESSAGE), dat.made_from); + } +- catch (Botan::Exception & e) ++ catch (std::exception & e) + { + p.reset(new Pipe(new Hash_Filter("SHA-160"))); + error_in_transform(e, dat.made_from); diff --git a/dev-vcs/monotone/files/monotone-1.0-gcc6.patch b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch new file mode 100644 index 000000000000..f9e1751e09b9 --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch @@ -0,0 +1,64 @@ +Bug: https://bugs.gentoo.org/594538 + +--- a/src/cache_logger.hh ++++ b/src/cache_logger.hh +@@ -23,7 +23,7 @@ + // if given the empty filename, do nothing + explicit cache_logger(std::string const & filename, int max_size); + +- bool logging() const { return _impl; } ++ bool logging() const { return static_cast<bool>(_impl); } + + void log_exists(bool exists, int position, int item_count, int est_size) const; + void log_touch(bool exists, int position, int item_count, int est_size) const; +--- a/src/cmd_ws_commit.cc ++++ b/src/cmd_ws_commit.cc +@@ -1170,7 +1170,7 @@ + { + for (attr_map_t::iterator i = node->attrs.begin(); + i != node->attrs.end(); ++i) +- i->second = make_pair(false, ""); ++ i->second = make_pair(false, attr_value("")); + } + else + { +@@ -1179,7 +1179,7 @@ + E(node->attrs.find(a_key) != node->attrs.end(), origin::user, + F("path '%s' does not have attribute '%s'") + % path % a_key); +- node->attrs[a_key] = make_pair(false, ""); ++ node->attrs[a_key] = make_pair(false, attr_value("")); + } + + cset cs; +--- a/src/roster.cc ++++ b/src/roster.cc +@@ -223,7 +223,7 @@ + + bool marking_map::contains(node_id nid) const + { +- return _store.get_if_present(nid); ++ return static_cast<bool>(_store.get_if_present(nid)); + } + + void marking_map::remove_marking(node_id nid) +@@ -727,7 +727,7 @@ + bool + roster_t::has_node(node_id n) const + { +- return nodes.get_if_present(n); ++ return static_cast<bool>(nodes.get_if_present(n)); + } + + bool +@@ -1898,8 +1898,8 @@ + node_t const &left_node = left_roster.all_nodes().get_if_present(i->first); + node_t const &right_node = right_roster.all_nodes().get_if_present(i->first); + +- bool exists_in_left = (left_node); +- bool exists_in_right = (right_node); ++ bool exists_in_left = static_cast<bool>(left_node); ++ bool exists_in_right = static_cast<bool>(right_node); + + if (!exists_in_left && !exists_in_right) + mark_new_node(new_rid, n, new_markings); diff --git a/dev-vcs/monotone/files/monotone-1.0-glibc-2.14-file-handle.patch b/dev-vcs/monotone/files/monotone-1.0-glibc-2.14-file-handle.patch new file mode 100644 index 000000000000..a6e282232223 --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-glibc-2.14-file-handle.patch @@ -0,0 +1,166 @@ +Revision: da62cad10eda55aa233ac124273f3db4f541137a +Parent: 65bcb8cf8b32f68a5b48629b328f6d65979e58df +Author: Thomas Moschny <thomas.moschny@gmx.de> +Date: 07.05.2011 13:32:06 +Branch: net.venge.monotone + +Changelog: + +* src/rcs_file.cc: Rename struct "file_handle" to "rcs_file_handle" + to avoid a name clash with a struct of same name defined by newer + glibc's "fcntl.h". For aesthetic reasons, also rename struct + "file_source". + +References: +https://code.monotone.ca/p/monotone/source/commit/da62cad10eda55aa233ac124273f3db4f541137a/ +https://bugs.gentoo.org/396651 + +============================================================ +--- src/rcs_file.cc 885b3fbe7b6cfed78816f0e57cd71d44616213c6 ++++ src/rcs_file.cc 03cf68912a4a708545ebce3d415c0e970ddead0b +@@ -42,12 +42,12 @@ struct + + #ifdef HAVE_MMAP + struct +-file_handle ++rcs_file_handle + { + string const & filename; + off_t length; + int fd; +- file_handle(string const & fn) : ++ rcs_file_handle(string const & fn) : + filename(fn), + length(0), + fd(-1) +@@ -60,13 +60,13 @@ file_handle + if (fd == -1) + throw oops("open of " + filename + " failed"); + } +- ~file_handle() ++ ~rcs_file_handle() + { + if (close(fd) == -1) + throw oops("close of " + filename + " failed"); + } + }; +-struct file_source ++struct rcs_file_source + { + string const & filename; + int fd; +@@ -91,7 +91,7 @@ struct file_source + ++pos; + return good(); + } +- file_source(string const & fn, ++ rcs_file_source(string const & fn, + int f, + off_t len) : + filename(fn), +@@ -104,7 +104,7 @@ struct file_source + if (mapping == MAP_FAILED) + throw oops("mmap of " + filename + " failed"); + } +- ~file_source() ++ ~rcs_file_source() + { + if (munmap(mapping, length) == -1) + throw oops("munmapping " + filename + " failed, after reading RCS file"); +@@ -112,12 +112,12 @@ struct + }; + #elif defined(WIN32) + struct +-file_handle ++rcs_file_handle + { + string const & filename; + off_t length; + HANDLE fd; +- file_handle(string const & fn) : ++ rcs_file_handle(string const & fn) : + filename(fn), + length(0), + fd(NULL) +@@ -134,7 +134,7 @@ file_handle + if (fd == NULL) + throw oops("open of " + filename + " failed"); + } +- ~file_handle() ++ ~rcs_file_handle() + { + if (CloseHandle(fd)==0) + throw oops("close of " + filename + " failed"); +@@ -142,7 +142,7 @@ struct + }; + + struct +-file_source ++rcs_file_source + { + string const & filename; + HANDLE fd,map; +@@ -167,7 +167,7 @@ file_source + ++pos; + return good(); + } +- file_source(string const & fn, ++ rcs_file_source(string const & fn, + HANDLE f, + off_t len) : + filename(fn), +@@ -183,7 +183,7 @@ file_source + if (mapping==NULL) + throw oops("MapViewOfFile of " + filename + " failed"); + } +- ~file_source() ++ ~rcs_file_source() + { + if (UnmapViewOfFile(mapping)==0) + throw oops("UnmapViewOfFile of " + filename + " failed"); +@@ -193,7 +193,7 @@ file_source + }; + #else + // no mmap at all +-typedef istream file_source; ++typedef istream rcs_file_source; + #endif + + typedef enum +@@ -220,7 +220,7 @@ static token_type + } + + static token_type +-get_token(file_source & ist, ++get_token(rcs_file_source & ist, + string & str, + size_t & line, + size_t & col) +@@ -303,14 +303,14 @@ struct parser + + struct parser + { +- file_source & ist; ++ rcs_file_source & ist; + rcs_file & r; + string token; + token_type ttype; + + size_t line, col; + +- parser(file_source & s, ++ parser(rcs_file_source & s, + rcs_file & r) + : ist(s), r(r), line(1), col(1) + {} +@@ -489,8 +489,8 @@ parse_rcs_file(string const & filename, + parse_rcs_file(string const & filename, rcs_file & r) + { + #if defined(HAVE_MMAP) || defined(WIN32) +- file_handle handle(filename); +- file_source ifs(filename, handle.fd, handle.length); ++ rcs_file_handle handle(filename); ++ rcs_file_source ifs(filename, handle.fd, handle.length); + #else + ifstream ifs(filename.c_str()); + ifs.unsetf(ios_base::skipws); diff --git a/dev-vcs/monotone/files/monotone-1.0-pcre3.patch b/dev-vcs/monotone/files/monotone-1.0-pcre3.patch new file mode 100644 index 000000000000..932538e38a4b --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-pcre3.patch @@ -0,0 +1,26 @@ +Author: Francis Russell +Bug-Debian: http://bugs.debian.org/665448 +Description: The test 'syntax_errors_in_.mtn-ignore' from the monotone + test suite contains a .mtn-ignore file which contains a number of + regular expressions. Some of these are intended to match and fail to + match the names of files created by the test harness. The rest have + invalid syntax and should be ignored. + . + One regex, '(?<=\C)' is presumably intended to be invalid, but with + the most recent version of pcre3 matches most files and therefore + causes the test to fail. In fact, it appears to be a valid regex that + performs a positive look behind to match a single data unit (usually a + byte, even in UTF mode). This patch removes the problematic regex until + the issue can be addressed upstream. +Index: monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore +=================================================================== +--- monotone-1.0.orig/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore 2011-03-26 06:41:05.000000000 +0000 ++++ monotone-1.0/test/func/syntax_errors_in_.mtn-ignore/mtn-ignore 2012-03-25 20:02:37.695875219 +0100 +@@ -21,7 +21,6 @@ + [[:fnord:]] + \\x{123456} + (?(0)) +-(?<=\C) + \l + (?C256) + (?C1 diff --git a/dev-vcs/monotone/files/monotone-1.0-texinfo-5.1.patch b/dev-vcs/monotone/files/monotone-1.0-texinfo-5.1.patch new file mode 100644 index 000000000000..cb457b547d19 --- /dev/null +++ b/dev-vcs/monotone/files/monotone-1.0-texinfo-5.1.patch @@ -0,0 +1,625 @@ +Fixes build issue with texinfo-5.1 +https://bugs.gentoo.org/show_bug.cgi?id=483122 + +============================================================ +--- doc/monotone.texi fcc02ef992214968bfbdd4a1f968846535de22f7 ++++ doc/monotone.texi 4feaab5a3c304a6a465402d6069d214137d63198 +@@ -4845,7 +4845,7 @@ @subsection Global Options + Cancel all previous @option{--rcfile} options (standard rcfiles are + still loaded). See @ref{rcfiles}. + +-@itemx --root <arg> ++@item --root <arg> + Limit the search for a workspace to the specified root directory + + @item --ssh-sign <arg> +@@ -6247,7 +6247,7 @@ @section Informative + the root directory of the specified path (or the workspace, if no path + is given). + +-@itemx mtn list vars [@var{domain}] ++@item mtn list vars [@var{domain}] + @itemx mtn ls vars + @command{ls vars} is an alias for @command{list vars}. + +============================================================ +--- doc/pcrepattern.texi 43ef52850c1fd113b8a21d63634bafe61b3aec45 ++++ doc/pcrepattern.texi 7ae6fb9367a2410c588230742d63ff4f83daa909 +@@ -74,32 +74,32 @@ @subsubheading Characters and Metacharac + brackets, the metacharacters are as follows: + + @table @code +-@itemx \ ++@item \ + general escape character with several uses +-@itemx ^ ++@item ^ + assert start of string (or line, in multiline mode) +-@itemx $ ++@item $ + assert end of string (or line, in multiline mode) +-@itemx . ++@item . + match any character except newline (by default) +-@itemx [ ++@item [ + start character class definition +-@itemx | ++@item | + start of alternative branch +-@itemx ( ++@item ( + start subpattern +-@itemx ) ++@item ) + end subpattern +-@itemx ? ++@item ? + extends the meaning of @samp{(} + also 0 or 1 quantifier + also quantifier minimizer +-@itemx * ++@item * + 0 or more quantifier +-@itemx + ++@item + + 1 or more quantifier + also ``possessive quantifier'' +-@itemx @{ ++@item @{ + start min/max quantifier + @end table + +@@ -108,16 +108,16 @@ @subsubheading Characters and Metacharac + class". In a character class the only metacharacters are: + + @table @code +-@itemx \ ++@item \ + general escape character +-@itemx ^ ++@item ^ + negate the class, but only if the first character +-@itemx - ++@item - + indicates character range +-@itemx [ ++@item [ + POSIX character class (only if followed by POSIX + syntax) +-@itemx ] ++@item ] + terminates the character class + @end table + +@@ -159,25 +159,25 @@ @subsubheading Non-printing Characters + represents: + + @table @code +-@itemx \a ++@item \a + alarm, that is, the BEL character (hex 07) +-@itemx \c@var{x} ++@item \c@var{x} + "control-@var{x}", where @var{x} is any character +-@itemx \e ++@item \e + escape (hex 1B) +-@itemx \f ++@item \f + formfeed (hex 0C) +-@itemx \n ++@item \n + linefeed (hex 0A) +-@itemx \r ++@item \r + carriage return (hex 0D) +-@itemx \t ++@item \t + tab (hex 09) +-@itemx \@var{ddd} ++@item \@var{ddd} + character with octal code @var{ddd}, or backreference +-@itemx \x@var{hh} ++@item \x@var{hh} + character with hex code @var{hh} +-@itemx \x@{@var{hhh...}@} ++@item \x@{@var{hhh...}@} + character with hex code @var{hhh...} + @end table + +@@ -244,27 +244,27 @@ @subsubheading Non-printing Characters + @samp{\777} are permitted. For example: + + @table @code +-@itemx \040 ++@item \040 + is another way of writing a space +-@itemx \40 ++@item \40 + is the same, provided there are fewer than 40 + previous capturing subpatterns +-@itemx \7 ++@item \7 + is always a back reference +-@itemx \11 ++@item \11 + might be a back reference, or another way of + writing a tab +-@itemx \011 ++@item \011 + is always a tab +-@itemx \0113 ++@item \0113 + is a tab followed by the character @samp{3} +-@itemx \113 ++@item \113 + might be a back reference, otherwise the + character with octal code 113 +-@itemx \377 ++@item \377 + might be a back reference, otherwise + the byte consisting entirely of 1 bits +-@itemx \81 ++@item \81 + is either a back reference, or a binary zero + followed by the two characters @samp{8} and @samp{1} + @end table +@@ -294,25 +294,25 @@ @subsubheading Generic character types + following are always recognized: + + @table @code +-@itemx \d ++@item \d + any decimal digit +-@itemx \D ++@item \D + any character that is not a decimal digit +-@itemx \h ++@item \h + any horizontal whitespace character +-@itemx \H ++@item \H + any character that is not a horizontal whitespace character +-@itemx \s ++@item \s + any whitespace character +-@itemx \S ++@item \S + any character that is not a whitespace character +-@itemx \v ++@item \v + any vertical whitespace character +-@itemx \V ++@item \V + any character that is not a vertical whitespace character +-@itemx \w ++@item \w + any ``word'' character +-@itemx \W ++@item \W + any ``non-word'' character + @end table + +@@ -342,43 +342,43 @@ @subsubheading Generic character types + characters are: + + @table @code +-@itemx U+0009 ++@item U+0009 + Horizontal tab +-@itemx U+0020 ++@item U+0020 + Space +-@itemx U+00A0 ++@item U+00A0 + Non-break space +-@itemx U+1680 ++@item U+1680 + Ogham space mark +-@itemx U+180E ++@item U+180E + Mongolian vowel separator + @item U+2000 + En quad +-@itemx U+2001 ++@item U+2001 + Em quad +-@itemx U+2002 ++@item U+2002 + En space +-@itemx U+2003 ++@item U+2003 + Em space +-@itemx U+2004 ++@item U+2004 + Three-per-em space +-@itemx U+2005 ++@item U+2005 + Four-per-em space +-@itemx U+2006 ++@item U+2006 + Six-per-em space + @item U+2007 + Figure space +-@itemx U+2008 ++@item U+2008 + Punctuation space +-@itemx U+2009 ++@item U+2009 + Thin space +-@itemx U+200A ++@item U+200A + Hair space +-@itemx U+202F ++@item U+202F + Narrow no-break space +-@itemx U+205F ++@item U+205F + Medium mathematical space +-@itemx U+3000 ++@item U+3000 + Ideographic space + @end table + +@@ -386,19 +386,19 @@ @subsubheading Generic character types + The vertical space characters are: + + @table @code +-@itemx U+000A ++@item U+000A + Linefeed +-@itemx U+000B ++@item U+000B + Vertical tab +-@itemx U+000C ++@item U+000C + Formfeed +-@itemx U+000D ++@item U+000D + Carriage return +-@itemx U+0085 ++@item U+0085 + Next line +-@itemx U+2028 ++@item U+2028 + Line separator +-@itemx U+2029 ++@item U+2029 + Paragraph separator + @end table + +@@ -418,15 +418,15 @@ @subsubheading Newline Conventions + the following five sequences: + + @table @code +-@itemx (*CR) ++@item (*CR) + carriage return +-@itemx (*LF) ++@item (*LF) + linefeed +-@itemx (*CRLF) ++@item (*CRLF) + carriage return, followed by linefeed +-@itemx (*ANYCRLF) ++@item (*ANYCRLF) + any of the three above +-@itemx (*ANY) ++@item (*ANY) + all Unicode newline sequences + @end table + +@@ -474,9 +474,9 @@ @subsubheading Newline Sequences + pattern string with one of the following sequences: + + @table @code +-@itemx (*BSR_ANYCRLF) ++@item (*BSR_ANYCRLF) + @key{CR}, @key{LF}, or @key{CR}@key{LF} only +-@itemx (*BSR_UNICODE) ++@item (*BSR_UNICODE) + any Unicode newline sequence (the default) + @end table + +@@ -501,11 +501,11 @@ @subsubheading Unicode Character Propert + 256, but they do work in this mode. The extra escape sequences are: + + @table @code +-@itemx \p@{@var{xx}@} ++@item \p@{@var{xx}@} + a character with the @var{xx} property +-@itemx \P@{@var{xx}@} ++@item \P@{@var{xx}@} + a character without the @var{xx} property +-@itemx \X ++@item \X + an extended Unicode sequence + @end table + +@@ -618,83 +618,83 @@ @subsubheading Unicode Character Propert + @table @code + @item C + Other +-@itemx Cc ++@item Cc + Control +-@itemx Cf ++@item Cf + Format +-@itemx Cn ++@item Cn + Unassigned +-@itemx Co ++@item Co + Private use +-@itemx Cs ++@item Cs + Surrogate + + @item L + Letter +-@itemx Ll ++@item Ll + Lower case letter +-@itemx Lm ++@item Lm + Modifier letter +-@itemx Lo ++@item Lo + Other letter +-@itemx Lt ++@item Lt + Title case letter +-@itemx Lu ++@item Lu + Upper case letter + + @item M + Mark +-@itemx Mc ++@item Mc + Spacing mark +-@itemx Me ++@item Me + Enclosing mark +-@itemx Mn ++@item Mn + Non-spacing mark + + @item N + Number +-@itemx Nd ++@item Nd + Decimal number +-@itemx Nl ++@item Nl + Letter number +-@itemx No ++@item No + Other number + + @item P + Punctuation +-@itemx Pc ++@item Pc + Connector punctuation +-@itemx Pd ++@item Pd + Dash punctuation +-@itemx Pe ++@item Pe + Close punctuation +-@itemx Pf ++@item Pf + Final punctuation +-@itemx Pi ++@item Pi + Initial punctuation +-@itemx Po ++@item Po + Other punctuation +-@itemx Ps ++@item Ps + Open punctuation + + @item S + Symbol +-@itemx Sc ++@item Sc + Currency symbol +-@itemx Sk ++@item Sk + Modifier symbol +-@itemx Sm ++@item Sm + Mathematical symbol +-@itemx So ++@item So + Other symbol + + @item Z + Separator +-@itemx Zl ++@item Zl + Line separator +-@itemx Zp ++@item Zp + Paragraph separator +-@itemx Zs ++@item Zs + Space separator + @end table + +@@ -771,18 +771,18 @@ @subsubheading Simple assertions + described below. The backslashed assertions are: + + @table @code +-@itemx \b ++@item \b + matches at a word boundary +-@itemx \B ++@item \B + matches when not at a word boundary +-@itemx \A ++@item \A + matches at the start of the subject +-@itemx \Z ++@item \Z + matches at the end of the subject + also matches before a newline at the end of the subject +-@itemx \z ++@item \z + matches only at the end of the subject +-@itemx \G ++@item \G + matches at the first matching position in the subject + @end table + +@@ -993,33 +993,33 @@ @subsubheading POSIX Character Classes + supported class names are + + @table @code +-@itemx alnum ++@item alnum + letters and digits +-@itemx alpha ++@item alpha + letters +-@itemx ascii ++@item ascii + character codes 0 -- 127 +-@itemx blank ++@item blank + space or tab only +-@itemx cntrl ++@item cntrl + control characters +-@itemx digit ++@item digit + decimal digits (same as @samp{\d}) +-@itemx graph ++@item graph + printing characters, excluding space +-@itemx lower ++@item lower + lower case letters +-@itemx print ++@item print + printing characters, including space +-@itemx punct ++@item punct + printing characters, excluding letters and digits +-@itemx space ++@item space + white space (not quite the same as @samp{\s}) +-@itemx upper ++@item upper + upper case letters +-@itemx word ++@item word + ``word'' characters (same as @samp{\w}) +-@itemx xdigit ++@item xdigit + hexadecimal digits + @end table + +@@ -1071,22 +1071,22 @@ @subsubheading Internal Option Setting + @samp{)}. The option letters are + + @table @code +-@itemx i ++@item i + Caseless: characters in one case match the corresponding + characters in other cases as well. +-@itemx m ++@item m + Multiline: @samp{^} and @samp{$} match at newlines + as well as at beginning and end of string. +-@itemx s ++@item s + Dotall: dot matches any character, including newline characters. +-@itemx x ++@item x + Extended syntax: unescaped white space is ignored and embedded + comments are possible. +-@itemx J ++@item J + Dupnames: names for capturing subpattern need not be unique. +-@itemx U ++@item U + Ungreedy: quantifiers match as few times as possible by default. +-@itemx X ++@item X + Extra: for forward compatibility, give an error if any escape sequence + with no defined meaning appears. + @end table +@@ -1358,11 +1358,11 @@ @subsubheading Repetition + single-character abbreviations: + + @table @code +-@itemx * ++@item * + is equivalent to @{0,@} +-@itemx + ++@item + + is equivalent to @{1,@} +-@itemx ? ++@item ? + is equivalent to @{0,1@} + @end table + +@@ -2302,7 +2302,7 @@ @subsubheading Verbs that act immediatel + The following verbs act as soon as they are encountered: + + @table @code +-@itemx (*ACCEPT) ++@item (*ACCEPT) + + This verb causes the match to end successfully, skipping the remainder + of the pattern. When inside a recursion, only the innermost pattern is +@@ -2317,7 +2317,7 @@ @subsubheading Verbs that act immediatel + This matches @samp{AB}, @samp{AAD}, or @samp{ACD}, but when it matches + @samp{AB}, no data is captured. + +-@itemx (*FAIL) @r{or} (*F) ++@item (*FAIL) @r{or} (*F) + + This verb causes the match to fail, forcing backtracking to occur. It + is equivalent to @samp{(?!)} but easier to read. It is not clear +@@ -2334,7 +2334,7 @@ @subsubheading Verbs that act after back + occurs. + + @table @code +-@itemx (*COMMIT) ++@item (*COMMIT) + + This verb causes the whole match to fail outright if the rest of the + pattern does not match. Even if the pattern is unanchored, no further +@@ -2350,7 +2350,7 @@ @subsubheading Verbs that act after back + This matches @samp{xxaab} but not @samp{aacaab}. It can be thought of + as a kind of dynamic anchor, or ``I've started, so I must finish.'' + +-@itemx (*PRUNE) ++@item (*PRUNE) + + This verb causes the match to fail at the current position if the rest + of the pattern does not match. If the pattern is unanchored, the +@@ -2363,7 +2363,7 @@ @subsubheading Verbs that act after back + are some uses of @code{(*PRUNE)} that cannot be expressed in any other + way. + +-@itemx (*SKIP) ++@item (*SKIP) + + This verb is like @code{(*PRUNE)}, except that if the pattern is + unanchored, the "bumpalong" advance is not to the next character, but +@@ -2383,7 +2383,7 @@ @subsubheading Verbs that act after back + attempt would start at the second character instead of skipping on to + @samp{c}. + +-@itemx (*THEN) ++@item (*THEN) + + This verb causes a skip to the next alternation if the rest of the + pattern does not match. That is, it cancels pending backtracking, but diff --git a/dev-vcs/monotone/files/monotone.confd b/dev-vcs/monotone/files/monotone.confd new file mode 100644 index 000000000000..717725431717 --- /dev/null +++ b/dev-vcs/monotone/files/monotone.confd @@ -0,0 +1,25 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# The commented variables in this file are the defaults that are used + +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Location of the served database +#MTN_DB="/var/lib/monotone/default.mtn" + +# Server identification +#MTN_KEY="monotone@`hostname --fqdn`" +#MTN_PWD="" + +# User and group as which to run monotone +#MTN_USER="monotone" +#MTN_GROUP="monotone" + +# The address and or port (ADDRESS[:PORT]) monotone should listen on +#MTN_ADDRESS=0.0.0.0 + +# Advanced options +#MTN_CONFDIR=/etc/monotone +#MTN_KEYDIR=/var/lib/monotone/keys diff --git a/dev-vcs/monotone/files/read-permissions b/dev-vcs/monotone/files/read-permissions new file mode 100644 index 000000000000..d08200aa0059 --- /dev/null +++ b/dev-vcs/monotone/files/read-permissions @@ -0,0 +1,7 @@ +pattern "net.example.project.{private,security}*" +allow "joe@example.net" +allow "jim@example.net" + +comment "everyone can read these branches" +pattern "net.example.{public,project}*" +allow "*" diff --git a/dev-vcs/monotone/files/write-permissions b/dev-vcs/monotone/files/write-permissions new file mode 100644 index 000000000000..1b138c7fc6c0 --- /dev/null +++ b/dev-vcs/monotone/files/write-permissions @@ -0,0 +1,2 @@ +joe@example.net +jim@example.net diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml new file mode 100644 index 000000000000..fd524bde49c9 --- /dev/null +++ b/dev-vcs/monotone/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<!-- maintainer-needed --> + <longdescription>A free distributed version control system. It provides a simple, +single-file transactional version store, with fully disconnected +operation and an efficient peer-to-peer synchronization +protocol. It understands history-sensitive merging, lightweight +branches, integrated code review and 3rd party testing. It uses +cryptographic version naming and client-side RSA certificates. It +has good internationalization support, has no external +dependencies, runs on linux, solaris, OSX, windows, and other +unixes, and is licensed under the GNU GPL. + </longdescription> +</pkgmetadata> diff --git a/dev-vcs/monotone/monotone-1.0-r4.ebuild b/dev-vcs/monotone/monotone-1.0-r4.ebuild new file mode 100644 index 000000000000..16d77a02eb42 --- /dev/null +++ b/dev-vcs/monotone/monotone-1.0-r4.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ +EAPI="4" +inherit bash-completion-r1 elisp-common eutils toolchain-funcs user + +DESCRIPTION="Monotone Distributed Version Control System" +HOMEPAGE="http://monotone.ca" +SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="amd64 ~ia64 x86" +IUSE="doc ipv6 nls test" + +RDEPEND="sys-libs/zlib + >=dev-libs/libpcre-7.6 + >=dev-libs/botan-1.8.0:0 + >=dev-db/sqlite-3.3.8 + >=dev-lang/lua-5.1 + net-dns/libidn" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.33.1 + nls? ( >=sys-devel/gettext-0.11.5 ) + doc? ( sys-apps/texinfo ) + test? ( dev-tcltk/expect + app-shells/bash-completion )" + +pkg_setup() { + enewgroup monotone + enewuser monotone -1 -1 /var/lib/monotone monotone +} + +src_prepare() { + if [[ $(gcc-major-version) -lt "3" || + ( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then + die 'requires >=gcc-3.4' + fi + epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" + epatch "${FILESDIR}/monotone-1.0-botan-1.10-v2.patch" + epatch "${FILESDIR}/monotone-1.0-glibc-2.14-file-handle.patch" + epatch "${FILESDIR}/monotone-1.0-boost-1.53.patch" + epatch "${FILESDIR}/monotone-1.0-pcre3.patch" + epatch "${FILESDIR}/monotone-1.0-texinfo-5.1.patch" + epatch "${FILESDIR}/monotone-1.0-gcc6.patch" +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable ipv6) +} + +src_compile() { + emake + use doc && emake html +} + +src_test() { + # Disables netsync_bind_opt test + # https://code.monotone.ca/p/monotone/issues/179/ + export DISABLE_NETWORK_TESTS=true + if [[ ${UID} != 0 ]]; then + emake check + else + ewarn "Tests will fail if ran as root, skipping." + fi +} + +src_install() { + emake DESTDIR="${D}" install + + mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die + + rm "${ED}"/etc/bash_completion.d/monotone.bash_completion || die + newbashcomp extra/shell/monotone.bash_completion ${PN} + + if use doc; then + dohtml -r doc/html/* + dohtml -r doc/figures + fi + + dodoc AUTHORS NEWS README* UPGRADE + docinto contrib + docompress -x /usr/share/doc/${PF}/contrib + dodoc -r contrib + newconfd "${FILESDIR}"/monotone.confd monotone + newinitd "${FILESDIR}"/${PN}-0.36.initd monotone + + insinto /etc/monotone + newins "${FILESDIR}"/hooks.lua hooks.lua + newins "${FILESDIR}"/read-permissions read-permissions + newins "${FILESDIR}"/write-permissions write-permissions + + keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone + fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone +} + +pkg_postinst() { + elog + elog "For details and instructions to upgrade from previous versions," + elog "please read /usr/share/doc/${PF}/UPGRADE.bz2" + elog + elog " 1. edit /etc/conf.d/monotone" + elog " 2. import the first keys to enable access with" + elog " env HOME=\${homedir} mtn pubkey me@example.net | /etc/init.d/monotone import" + elog " Thereafter, those with write permission can add other keys via" + elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT" + elog " can be used in the read-permission and write-permission files." + elog " 3. adjust permisions in /etc/monotone/read-permissions" + elog " and /etc/monotone/write-permissions" + elog " 4. start the daemon: /etc/init.d/monotone start" + elog " 5. make persistent: rc-update add monotone default" + elog +} |