Commit graph

367 commits

Author SHA1 Message Date
Joey Hess
40634fb683 quick fix to build with old warp-tls
Debian stable's warp-tls is too old to support the new https feature well,
so only use http with that old version.

Note that the webapp still depends on warp-tls, because the TLSSettings
type is used.

(cherry picked from commit 06218428c7)
2014-03-12 12:26:08 -04:00
Joey Hess
fb5d12ab92 tagging package git-annex version 5.20140306
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAUxioD8kQ2SIlEuPHAQjRqhAAnBeZQqOknAr6OmQLQ117KvhZNynwEoG0
 0gdlQLySkDKlClg/qMTDs4G/58/9duMU7h1SHoG4j8wwAGW4654f1iT7xbD6Luoj
 ltVvTJfUxrFiWoGQCicBx2u8Chuj8jIq74JxejjDbxCz3uMar07FVDs/7rUxTlq9
 2OmpKvCL+a27pTV8GZzvh5UeJfPIQbCWKCkgtg/26ujtmG0cZEUkcuMJ9M877U3W
 bL3UYS/iT9cta9Vtrix/i6R2wZm+V8PYhQpuB1AXpNHHCYSFxJcZgJUVB+CynOVc
 /gQkBHfsG/1epZ3kXW50+yEWNb5bbPFnaQHZaL2oAQoEzGDpdlqOfWLRgiMDWo0t
 bJGz02Cj7SuGzFBRwHC2ZVeaYDKMSxbzkUclmVONWcpj13hl6Eyva7lVhoj+lHmc
 vbv/P+rf3a2ev2pFxvCDFw3CGToLL6kpmtzwoG152pXSSFYXddAcqGkHUC3uKym4
 kfZ9UWcU/yYFe4TtLTFOAYU1hoUnS8iprUzlOI/BaZex4KNCxI64r5MVik17RijC
 XQCu4Zx9BeL74ew9y5gaKlUlm8RblTouqOaBDdUw7bcMNlAq2Te2nC2st0abmik9
 gPhjQud62h65FfHHKxUCbwCU2Dm2W0pXxDHl2zF+rRm+oQNyv6U5qk8tAoyQqJTY
 I+RfZ0urOcM=
 =JwHZ
 -----END PGP SIGNATURE-----

Updating backport to newest release.
2014-03-12 11:57:11 -04:00
Joey Hess
93a526ba82 prep release 2014-03-06 12:29:11 -04:00
Joey Hess
cdc5b4a385 depend on warp-tls.. at least for now 2014-02-28 21:37:33 -04:00
Joey Hess
0609d754cc prep release 2014-02-27 11:36:38 -04:00
Joey Hess
692fbc6d7e Add build dep on regex-compat to fix build on mipsel, which lacks regex-tdfa. 2014-02-26 13:41:33 -04:00
Joey Hess
06e9080f01 metadata: FIeld names are now case insensative. 2014-02-25 18:45:09 -04:00
Joey Hess
06142f4943
fix #740010 properly 2014-02-25 01:55:01 -04:00
Joey Hess
003fc2b7e1
add UrlOptions sum type 2014-02-24 22:00:25 -04:00
Joey Hess
d5a2b498f6 webdav: When built with DAV 0.6.0, use the new DAV monad to avoid locking files, which is not needed by git-annex's use of webdav, and does not work on Box.com. 2014-02-24 18:21:51 -04:00
Joey Hess
1f6f034e90 prep release 2014-02-21 11:24:18 -04:00
Joey Hess
f78b81f463 tagging package git-annex version 5.20140210
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAUvkVDskQ2SIlEuPHAQho0Q//Y1+hSKqSUcbfuaV9nlU1puUi0VdYWouA
 SmSCpp1Kp44lPNERTrPPA66d8cQo12iCixAxnGt50Wl7n8VD8Py1kyqoNWgMe54W
 H3A7rC58mzXYXWEox1xgX6Sz/RbYMekx9NbALpgQZkVtnOsKO7lNClx1LUNpvXwh
 U52/D4ABpOLAjcb4HS2rs1Z4w0u6fFvFas313RXhIEIecuS2Iz1V/h4Wv6fPkJGR
 S38rG3OQfFXL0v6cU1l+jM2at7sEs+f7q2sujIam3/kgcdysgnyU7rV+p2xqv2+e
 LeOiHszGhjdlK6wnKOoXDZ0rvdNfUzUXbFGHIZfg5ACYR9Ps5hVqfDH6J9riCH8J
 F4WzuDBtKcdVJyBehB/yWw4/ABh5D4YoC2+rsWm6buu/pX5qU+Yshu8X5LRX6h4h
 Ex1jSE2QbTaXNkEa7+14Eb/NscRJqULzUhjBjCrd8JzOVe+jrK/2C2FLETv1ImfN
 G+8iOD/mQL71XwLhdMHA8jwqdSnJOtGXCgaVOcgBKe7E2qXqZAefVrjGvENHQUCb
 AxP2KjGDybYtrCSfHOdYiM8+IJvV/pgmDe9KFjNsUemG+20+a+D64+4b890HwpTT
 gLQpw8U5EwFXgLsYFqu4YBcuVck8T9bEzQhG1FKu2ZP9QJPqR6Z3W2T8jGRyYuC7
 pFh2EtFUKZQ=
 =ojkV
 -----END PGP SIGNATURE-----

Merge tag '5.20140210' into debian-wheezy-backport

tagging package git-annex version 5.20140210

Conflicts:
	debian/control
	git-annex.cabal
2014-02-20 22:55:13 +00:00
Joey Hess
f11f7520b5 windows: Fix process termination code.
The ctrl-c hack used before didn't actually seem to work.

No haskell libraries expose TerminateProcess. I tried just calling it via
FFI, but got segfaults, probably to do with the wacky process handle not
being managed correctly. Moving it all into one C function worked.

This was hell. The EvilLinker hack was just final icing on the cake.
We all know what the cake was made of.
2014-02-13 15:53:10 -04:00
Joey Hess
b3a002f21d prep release 2014-02-10 12:59:18 -04:00
Joey Hess
250df4685c avoid broken version of DAV 2014-02-07 17:42:52 -04:00
Joey Hess
4602b3bcbc updating cabal release only 2014-01-29 13:58:49 -04:00
Joey Hess
998d76ae04 Revert "temporarily revert tasty-rerun support for this release"
This reverts commit 8fcf041159.
2014-01-27 14:22:44 -04:00
Joey Hess
8fcf041159 temporarily revert tasty-rerun support for this release
revert c340d9506c

tasty-rerun is stuck in NEW in debian
2014-01-27 13:58:43 -04:00
Joey Hess
e0224f01c1 prep release 2014-01-27 13:44:12 -04:00
Joey Hess
c340d9506c tasty-rerun! make rerest runs much much faster than running whole test suite 2014-01-24 12:21:30 -04:00
Joey Hess
8a651bafd2 git-annex release 5.20140117 for unstable [dgit]
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIVAwUAUtl+XskQ2SIlEuPHAQjFvxAAsDrvW7PkVB09QGq0y0WI2aw1VeiQ+Zl1
 5s1PxrJnSddKWhvnLM+jwP3eL5q+HPsOjz3CVzwBkhFPR9D3iVAg/766tRiwQZB4
 B1JCCOnzs6YsTr/prdHDQ+p3HQLp8WIg84d+Mcmfin0i9vvW6T07oDOmpLQHk1sc
 EsJu1jBG6wY6uI+jxciXtzo+tM1fywy3Ko3OZVqmN5RufjV4dMNEjyUAQIFuQ3q1
 AZPDoKZsj44EPHNomflFnD1rUeEKfK3jXO5Hjb059ABGVuRb5Z6GRgKSCkht2MLP
 9cz8n677S3FPli1w7B3mJSqkVFrjyk9ITq/RISawQ9gKCgmZ3PWkP199fJipIP0K
 8tjhihgCb7m9WnxnTyN+GrmHfBA7zcorkXyhs56kjuRSo4fwlPQ+AwbkdIpU8YlW
 O0PJoWP/qjMjgzyzXdCAjdame3T12kfK9VQQL2fZrSt0I6Y2WCe7T7W2/ii51LQs
 vRxFhe96MJPvOU4eW7YJ3xzMtvey76Nq9KuIrqw7lgtcFLmGAVqnqMTaHQyB2my/
 1iCUU2qt0TZkWbTwVO6V8fdLOM2AUfZGwnTpbAac+v01c4PBtBl0id773s5SW85L
 Vcsrs8O20oOWj65/yP0c9JZH82D7qdahObSlczcP85z6yHLOb9t9HtuvMkPRhXvs
 axTdEmB2DcY=
 =1pPT
 -----END PGP SIGNATURE-----

Merge tag 'debian/5.20140117' into debian-wheezy-backport

git-annex release 5.20140117 for unstable [dgit]

Conflicts:
	debian/control
2014-01-24 14:24:33 +00:00
Joey Hess
e38a21a768 tests should now all run independently, without needing any prior tests to have run
Should be ready now for tasty-rerun.
2014-01-21 14:26:13 -04:00
Joey Hess
4a4e2f9a6c use tasty resources 2014-01-21 14:04:50 -04:00
Joey Hess
d1bf61464f expose tasty test suite's option parser 2014-01-21 00:08:43 -04:00
Joey Hess
ecd4c35d7e promote stm dependency, since Remote.External needs it 2014-01-20 14:32:06 -04:00
Joey Hess
3cbb366ebc Really fix FTBFS on mipsel and sparc due to test suite not being available on those architectures. 2014-01-17 14:48:56 -04:00
Joey Hess
31b80e55f8 prep release 2014-01-16 11:38:16 -04:00
Joey Hess
85272d8a98 Added tahoe special remote.
Known problems:

1. Tries to tahoe start when daemon is already running.

2. If multiple tahoe remotes are set up on the same computer,
   they will have the same node.url configured by default,
   and this confuses tahoe commands.

This commit was sponsored by LeastAuthority.com
2014-01-08 16:14:41 -04:00
Joey Hess
5740489927 Revert "need a newish version of containers"
This reverts commit bad6b46f7f.
2014-01-07 20:42:13 -04:00
Joey Hess
bad6b46f7f need a newish version of containers 2014-01-07 14:18:41 -04:00
Joey Hess
0a98f1be15 prep release 2014-01-07 12:25:12 -04:00
Joey Hess
1c02fc4987 no lsof on kfreebsd 2014-01-07 12:12:36 -04:00
Joey Hess
515e2fef54 prep release 2013-12-30 14:20:55 -04:00
Joey Hess
0e47d6ba97 prep release 2013-12-21 12:00:47 -04:00
Joey Hess
a168b8de12 switch define used, not android specific 2013-12-18 02:06:15 -04:00
Joey Hess
d7ee0bdbb8 OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default. 2013-12-13 14:25:24 -04:00
Joey Hess
011b8bc7ec pull in Win32-extras, to be able to get current process id in Windows
Fixed up a number of things that had worked around there not being a way to
get that.

Most notably, transfer info files on windows now include the process id,
since no locking is currently done. This means the file format varies
between windows and unix.
2013-12-11 00:15:10 -04:00
Joey Hess
063a183a61 windows disk free space checking 2013-12-10 01:18:04 -04:00
Joey Hess
85936392ec fix 2013-12-06 22:38:01 -04:00
Joey Hess
0a66293600 avoid hsc2hs on windows (more epathtolong) 2013-12-06 18:06:22 -04:00
Joey Hess
e5a683ae4c enable Webapp on windows, using EvilLinker to link 2013-12-06 15:04:19 -04:00
Joey Hess
eed6809525 isolate dependency workaround to windows 2013-12-05 21:25:20 -04:00
Joey Hess
97c4af975f syntax 2013-12-05 20:42:52 -04:00
Joey Hess
b2e56dab52 temporarily disable webapp on windows; re-enable webdav on windows
The gcc response file should make it build with webdav (fingers crossed).

webapp is waiting on a haskell platform upgrade on the autobuilder.
Current one has a too old version of network for hxt to install.
2013-12-05 19:15:23 -04:00
Joey Hess
10309c1d80 work around https://github.com/kazu-yamamoto/logger/issues/18 2013-12-05 17:51:46 -04:00
Joey Hess
d99b2db372 Revert "test enable webapp on windows"
This reverts commit 958d9fa110.

Some stuff fails to install on the autobuilder, it will need to be upgraded
probably.
2013-12-05 14:23:42 -04:00
Joey Hess
958d9fa110 test enable webapp on windows
It builds, but fails to link locally. Let's try on the autobuilder.
2013-12-05 14:17:31 -04:00
Joey Hess
4ebb35dc59 explicitly disable WebDAV on Windows
For reasons suspiciously similar to 342d508e -- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
2013-12-04 17:14:24 -04:00
Joey Hess
4249c85ece prep release 2013-11-30 16:33:03 -04:00
Joey Hess
27b70f7c5b update 2013-11-28 08:00:42 -04:00