Merge branch 'master' of git://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
270e0da9e5
7 changed files with 53 additions and 50 deletions
|
|
@ -15,3 +15,8 @@ Add a repository on a Box.net server to an existing repository from the webapp (
|
|||
|
||||
git annex 5.20140128-g32f1f68 on Android 4.1.2 (Samsung GTN8010)
|
||||
Build flags: Assistant Webapp S3 WebDAV Inotify XMPP DNS Feeds Quvi TDFA CryptoHash
|
||||
|
||||
> Cooincidentially I noticed I'd dropped the patch that fixes that on
|
||||
> Android, and have been in the process of rebuilding the Android
|
||||
> autobuilder with it today. That build has finished now. [[done]]
|
||||
> --[[Joey]]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
|
||||
nickname="dxtrish"
|
||||
subject="comment 6"
|
||||
date="2014-02-08T17:23:54Z"
|
||||
content="""
|
||||
Googling around I found [this](http://lpaste.net/77947) codesnippet that suggests setSocketOption is broken under OpenBSD
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.163"
|
||||
subject="comment 7"
|
||||
date="2014-02-08T17:42:52Z"
|
||||
content="""
|
||||
What was the ugly hack that got it to link?
|
||||
|
||||
I've seen setSocketOption fail on other OS's for various portability reasons. The haskell library that is responsible for this is <http://hackage.haskell.org/package/network>, and you can find several setSocketOption calls in it. I've had good luck ifdefing those out when they don't work.
|
||||
|
||||
Here's a patch where I disable the IPv6Only setting on Android (amoung other unrelated porting) <http://source.git-annex.branchable.com/?p=source.git;a=blob;f=standalone/android/haskell-patches/network_2.4.1.0_0001-android-port-fixes.patch;h=66c0de5448bacaf7449db768b4d720870bbcf9c4;hb=HEAD>
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
|
||||
nickname="dxtrish"
|
||||
subject="comment 8"
|
||||
date="2014-02-08T18:13:33Z"
|
||||
content="""
|
||||
What I did was to temporarily move away (or rename) the offending libs. What I essentially did was this:
|
||||
|
||||
cabal configure
|
||||
cabal build
|
||||
sudo mv /usr/local/lib/lib{xml2,gnutls,gsasl,idn}.a /tmp
|
||||
cabal install
|
||||
sudo mv /tmp/lib{xml2,gnutls,gsasl,idn}.a /usr/local/lib
|
||||
|
||||
but I've also had to patch network-info. I've contacted the maintainer of that package but I haven't received anything. I'm considering creating an actual fork with my changes but that would almost seem kind of silly as I don't know *ANY* haskell.. But I am looking at the Haskell wiki as I'm typing this so I can see what I'm looking at :).
|
||||
|
||||
Won't break anything by not setting SO_REUSEADDR? I suspect you're setting it for a reason?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.163"
|
||||
subject="doubt this has anything to do with spaces"
|
||||
date="2014-02-08T17:44:45Z"
|
||||
content="""
|
||||
If you want to drop the files from the remote, you need to also pass the --from option to dropunused. Otherwise, it defaults to dropping any of the unused files that are present in the local repository.
|
||||
"""]]
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
From afdec6c9e66211a0ac8419fffe191b059d1fd00c Mon Sep 17 00:00:00 2001
|
||||
From: foo <foo@bar>
|
||||
Date: Sun, 22 Sep 2013 17:24:33 +0000
|
||||
Subject: [PATCH] fix build with new base
|
||||
|
||||
---
|
||||
Data/Text/IDN/IDNA.chs | 1 +
|
||||
Data/Text/IDN/Punycode.chs | 1 +
|
||||
Data/Text/IDN/StringPrep.chs | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/Data/Text/IDN/IDNA.chs b/Data/Text/IDN/IDNA.chs
|
||||
index ed29ee4..dbb4ba5 100644
|
||||
--- a/Data/Text/IDN/IDNA.chs
|
||||
+++ b/Data/Text/IDN/IDNA.chs
|
||||
@@ -31,6 +31,7 @@ import Foreign
|
||||
import Foreign.C
|
||||
|
||||
import Data.Text.IDN.Internal
|
||||
+import System.IO.Unsafe
|
||||
|
||||
#include <idna.h>
|
||||
#include <idn-free.h>
|
||||
diff --git a/Data/Text/IDN/Punycode.chs b/Data/Text/IDN/Punycode.chs
|
||||
index 24b5fa6..4e62555 100644
|
||||
--- a/Data/Text/IDN/Punycode.chs
|
||||
+++ b/Data/Text/IDN/Punycode.chs
|
||||
@@ -32,6 +32,7 @@ import Data.List (unfoldr)
|
||||
import qualified Data.ByteString as B
|
||||
import qualified Data.Text as T
|
||||
|
||||
+import System.IO.Unsafe
|
||||
import Foreign
|
||||
import Foreign.C
|
||||
|
||||
diff --git a/Data/Text/IDN/StringPrep.chs b/Data/Text/IDN/StringPrep.chs
|
||||
index 752dc9e..5e9fd84 100644
|
||||
--- a/Data/Text/IDN/StringPrep.chs
|
||||
+++ b/Data/Text/IDN/StringPrep.chs
|
||||
@@ -39,6 +39,7 @@ import qualified Data.ByteString as B
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.Encoding as TE
|
||||
|
||||
+import System.IO.Unsafe
|
||||
import Foreign
|
||||
import Foreign.C
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
|
@ -106,6 +106,8 @@ install_pkgs () {
|
|||
patched uuid
|
||||
patched dns
|
||||
patched gnutls
|
||||
patched libxml-sax
|
||||
patched network-protocol-xmpp
|
||||
|
||||
cd ..
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue