Commit graph

31904 commits

Author SHA1 Message Date
Joey Hess
aa652a4933
link to daily arm autobuild for now 2018-04-25 13:52:12 -04:00
Joey Hess
389e15696a
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-25 13:50:06 -04:00
oliv5kta@248adc7a643dc1f0ecef26925e357de176d0f6f3
eddfe27342 Added a comment 2018-04-25 17:49:48 +00:00
Joey Hess
118ed8f92b
runshell: hacks for termux; add tip
Added some tweaks to make git-annex work in termux on Android. The regular
arm standalone tarball now works in termux.

I guess the test for "$base/bin/git" is not really necessary, since it
tests for git-annex. Since that gets deleted on android, removed that test.

These are pretty hackish hacks, especially adding it to PATH. The goal is
to make it work well enough out of the box on Android.

This commit was sponsored by Eric Drechsel on Patreon.
2018-04-25 13:48:37 -04:00
Joey Hess
dd7ab91f97
runshell: Unset LD_PRELOAD
Preloaded libraries from the host system may not get along with the bundled
linker.

This was observed by users in termux:

ERROR: ld.so: object '/data/data/com.termux/files/usr/lib/libtermux-exec.so' from LD_PRELOAD cannot be preloaded (wrong ELF class:
ELFCLASS64): ignored.
Bad system call

But it could also affect more usual systems; the preloaded library might rely
on symbols from the host libc that are not available or have the wrong versions
in the bundled libc. Unsetting LD_PRELOAD entirely seems safest.
2018-04-25 13:40:48 -04:00
Joey Hess
3753c07204
update 2018-04-25 11:19:59 -04:00
Joey Hess
5a01ebe036
update 2018-04-24 21:28:08 -04:00
Joey Hess
3c6e60dc69
fix build with old http-conduit 2018-04-24 21:23:40 -04:00
Joey Hess
43b4e80bf5
update 2018-04-24 21:22:20 -04:00
Joey Hess
526243d6f5
catch exceptions from getEffectiveUserID
This fixes a crash when using the linux_standalone build in termux on
android.

This commit was sponsored by Jeff Goeke-Smith on Patreon.
2018-04-24 20:10:10 -04:00
Joey Hess
ec7262bb87
notes 2018-04-24 19:53:24 -04:00
Joey Hess
6b68813988
OMG 2018-04-24 19:04:07 -04:00
Joey Hess
45a51d5335
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-22 14:02:40 -04:00
Joey Hess
6ea356034d
update 2018-04-22 13:58:18 -04:00
Joey Hess
aebf9e6dd5
Fix build with yesod 1.6.
Also avoid some depreaction warnings.
2018-04-22 13:56:35 -04:00
Joey Hess
1cb300e68a
squish build warning when built w/o S3 2018-04-22 13:55:37 -04:00
Joey Hess
891d6d97f7
squash -Wsimplifiable-class-constraints warnings
I have not tested this with older ghc than 8.2.2.
2018-04-22 13:42:21 -04:00
Joey Hess
c0c66e35b2
remove unused import 2018-04-22 13:42:04 -04:00
Joey Hess
f5a5886307
squash build warning with optparse-applicative-0.14.1
It exported some stuff that used to be only in .Internal, IIRC done at
my request..
2018-04-22 13:41:24 -04:00
Joey Hess
256d8f07e8
avoid insertWith' depreaction warning
Switch to Data.Map.Strict everywhere that used it.

There are still lots of lazy maps in git-annex. I think switching these
is safe. The risk is that there might be a map that is used in a way
that relies on the values not being evaluated to WHNF, and switching to
strict might result in bad performance or memory use. So, I have not
switched everything.
2018-04-22 13:28:31 -04:00
Joey Hess
558a0a9328
deal with conduit 1.3 change
I don't know if this will build with older conduit, it may need an
ifdef.
2018-04-22 13:14:55 -04:00
spwhitton
41dc937c77 Added a comment: current status of v6 2018-04-21 19:47:10 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
8ccbafa917 Added a comment 2018-04-21 09:52:31 +00:00
andrew
9fddca2780 Added a comment: integrating git-annex-turtle into git-annex 2018-04-20 18:24:22 +00:00
andrew
bec70f86c4 Added a comment: git-annex not a cask anymore 2018-04-20 13:21:27 +00:00
svw
faa313122e Added a comment: Passing flags to youtube-dl 2018-04-20 05:57:39 +00:00
moaxey
76bcf0da6e Added a comment: I also found this log 2018-04-17 22:52:15 +00:00
moaxey
ef297b2ecb 2018-04-17 22:34:24 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
8a681bad73 Added a comment 2018-04-17 08:38:33 +00:00
yarikoptic
82ee2919a3 Added a comment 2018-04-17 03:52:55 +00:00
Joey Hess
c72e9ae568
hmm 2018-04-16 20:41:11 -04:00
Joey Hess
4d75c3d48e
avoid wrapping symlinks 2018-04-16 18:31:10 -04:00
Joey Hess
0a74404c97
move orig/ to .orig
gcc looks for programs in a path relative to its executable's location..
2018-04-16 17:47:35 -04:00
Joey Hess
f821b0e046
fix path 2018-04-16 17:34:27 -04:00
Joey Hess
1bed62bda9
android: try harder to force PIE for android 5+
This may work around ghc's -no-pie flag. Untested.
2018-04-16 17:30:21 -04:00
Joey Hess
f4e1cd2a8a
followup 2018-04-16 16:42:38 -04:00
Joey Hess
87b834535a
copy info from comment on install/Android 2018-04-16 16:41:31 -04:00
Joey Hess
32bf25be3d
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-16 16:34:44 -04:00
Joey Hess
89e1a05a8f
Fix mangling of --json output of utf-8 characters when not running in a utf-8 locale
As long as all code imports Utility.Aeson rather than Data.Aeson,
and no Strings that may contain utf-8 characters are used for eg, object
keys via T.pack, this is guaranteed to fix the problem everywhere that
git-annex generates json.

It's kind of annoying to need to wrap ToJSON with a ToJSON', especially
since every data type that has a ToJSON instance has to be ported over.
However, that only took 50 lines of code, which is worth it to ensure full
coverage. I initially tried an alternative approach of a newtype FileEncoded,
which had to be used everywhere a String was fed into aeson, and chasing
down all the sites would have been far too hard. Did consider creating an
intentionally overlapping instance ToJSON String, and letting ghc fail
to build anything that passed in a String, but am not sure that wouldn't
pollute some library that git-annex depends on that happens to use ToJSON
String internally.

This commit was supported by the NSF-funded DataLad project.
2018-04-16 16:21:21 -04:00
hobbes@b2cacef69071743c3a831e60511062f7e014e52f
dd36f22098 Added a comment: Modern Android? 2018-04-16 19:28:09 +00:00
Joey Hess
6ddd374935
note 2018-04-16 12:21:33 -04:00
Joey Hess
8d08ccb710
Merge branch 'master' of ssh://git-annex.branchable.com 2018-04-16 12:20:36 -04:00
Joey Hess
93beff784a
add 2018-04-16 12:20:16 -04:00
yarikoptic
37f1deb722 Added a comment: old issue bites back 2018-04-16 05:53:01 +00:00
Michael
78f47b423b 2018-04-15 17:38:30 +00:00
Michael
0b5b829d42 2018-04-15 17:36:43 +00:00
Joey Hess
78ded0b744
devblog 2018-04-13 15:23:58 -04:00
Joey Hess
f56594af9e
finish fixing inverted Ord for TrustLevel
Flipped all comparisons. When a TrustLevel list was wanted from Trusted
downwards, used Down to compare it in that order.

This commit was sponsored by mo on Patreon.
2018-04-13 15:17:54 -04:00
Joey Hess
a0e4b9678b
fix inverted Ord for TrustLevel (intermediate commit)
This commit removes the Ord and Enum instances, commenting out all code
that depends on them, to make sure that all code effected by the
inversion fix has been identified.

(Assuming no ifdefs involve TrustLevel.)

The next commit will fix up all the identified code.
2018-04-13 14:50:14 -04:00
Joey Hess
1831cc4a7d
remove unused import 2018-04-13 14:43:29 -04:00