summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/httpd-shed/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/httpd-shed/files')
-rw-r--r--dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch b/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
new file mode 100644
index 000000000000..ca5a113b7014
--- /dev/null
+++ b/dev-haskell/httpd-shed/files/httpd-shed-0.4-network.patch
@@ -0,0 +1,21 @@
+[1 of 1] Compiling Network.Shed.Httpd ( Network/Shed/Httpd.hs, dist/build/Network/Shed/Httpd.o )
+
+Network/Shed/Httpd.hs:142:24:
+ Ambiguous occurrence `sClose'
+ It could refer to either `N.sClose',
+ imported from `Network' at Network/Shed/Httpd.hs:38:1-14
+ or `Network.Socket.sClose',
+ imported from `Network.Socket' at Network/Shed/Httpd.hs:48:1-21
+diff --git a/Network/Shed/Httpd.hs b/Network/Shed/Httpd.hs
+index 9dbc2a2..f4f7d5e 100644
+--- a/Network/Shed/Httpd.hs
++++ b/Network/Shed/Httpd.hs
+@@ -139,7 +139,7 @@ initServerMain processBody sockAddr callOut = do
+ hClose h
+ _ -> hClose h
+ return ()
+- ) `finally` sClose sock
++ ) `finally` N.sClose sock
+ where
+ loopIO m = do m
+ loopIO m