diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-03 11:50:49 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-04-03 14:36:34 +0100 |
commit | ea495c9ebc2ffc1c0b2bf9f866ce786276166bd1 (patch) | |
tree | 697c33f3ce12fffc26e35a1a9abb196a2a207f85 | |
parent | dev-haskell/hsopenssl: drop old (diff) | |
download | gentoo-ea495c9ebc2ffc1c0b2bf9f866ce786276166bd1.tar.gz gentoo-ea495c9ebc2ffc1c0b2bf9f866ce786276166bd1.tar.bz2 gentoo-ea495c9ebc2ffc1c0b2bf9f866ce786276166bd1.zip |
dev-haskell/hslogger: drop old
Package-Manager: portage-2.2.28
-rw-r--r-- | dev-haskell/hslogger/Manifest | 5 | ||||
-rw-r--r-- | dev-haskell/hslogger/files/hslogger-1.2.1-dev-log-rdetect.patch | 119 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.1-r2.ebuild | 30 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.1.ebuild | 25 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.3.ebuild | 32 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.4.ebuild | 32 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.6.ebuild | 32 | ||||
-rw-r--r-- | dev-haskell/hslogger/hslogger-1.2.8.ebuild | 33 |
8 files changed, 0 insertions, 308 deletions
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest index 66c80f4d0bad..4d6a80842f69 100644 --- a/dev-haskell/hslogger/Manifest +++ b/dev-haskell/hslogger/Manifest @@ -1,6 +1 @@ -DIST hslogger-1.2.1.tar.gz 35813 SHA256 c5538c3f79b9e8aac97a6f1377c82b9f70b88ee5e39f62f358953467e271cded SHA512 dfb2ab31913c2ba06575165f9d447cdd32d13772d971a283afb9914cdcf45e006e5bff45eb9f953a1dec6ffd2b7e585f18656dd43345af4728f24d9a1f8454b6 WHIRLPOOL 5f26778514a10242f4649d7f67049f2b1bc1136c3e87e21f47d4fe6375db1fa0287defdaf5284b1156fd560b976c4aa05316acb7d2d8982bbf15d7a15f96bd70 -DIST hslogger-1.2.3.tar.gz 36140 SHA256 f5ac392b01871af3f2e3eb2f1e4e20f9e9dbe22eeec7f7d1635913e1f294b166 SHA512 ebf1108efd8ecbcd8b67c3ce646f5ffde3f95ff8092ab8f9d0fb00b1207fc69db45b2abfdf71312b32e86d922672f88ca6dfce15c0c7371fc78dc223fdf61356 WHIRLPOOL d7d9aa3d75de124f94aaaa36733f71ab783f227e94893ef19116dd2a48525a15cd677ac614bf70116e857dbebb8c8e2eb0a7da68c372568b16c2d349b9cab8da -DIST hslogger-1.2.4.tar.gz 35794 SHA256 8c0fa8051efb693e398eddeece3486dfdb5eb9357c4ea5cfeb9f26f2313f0c64 SHA512 41880352ea3883bcdf12b50d6d7933ef092c715ff69f5b8bb57e4a603f09443cbf8188475b2968af04965387d4723fc194786794d9765c004a41541b70598581 WHIRLPOOL e486fceae0cd907f0114dbf02f7d349a86d178feb901da22dc55a37d6a0b61df14dc46556ecb3232b9da1d3e263176dc4d977f5cf791ebf0989ced6ccd1ef69d -DIST hslogger-1.2.6.tar.gz 36033 SHA256 7372e5d69a6a73011a677b914910f916b4cef59b1475eb635a1bd945043a1c7b SHA512 9aa5b2a64fd007b8868426d3e0964707729a30b167b2b3e1934a7bad8ab1e709ae7d6389c271dfde4fa4fbe4ced3b1a8a19b3c4b55733c3f666e80b9c18e2924 WHIRLPOOL 5e1f9cbb534de4035b001d52f4c72a5be67dc3f554b93efbea7b12ea75ac393b91251b1d84ca2255b74fcfe8a4769b48a80d456d109794123b1c782ca0d4063a -DIST hslogger-1.2.8.tar.gz 35720 SHA256 de3572c313d5c453c7407bfab07edf052a523fd25c8cbc41457b0ed14e94ec44 SHA512 b138c4c37f134955495cf247a19b80929a909291892c8d9e45b8abc457e77700cb3f7a6eff852b1f900306bfe216b5bdefe93a542118cb8ab5679e05373727fd WHIRLPOOL a99fb8d5f7f6a5ce07f62765f6251ff052a884d807c493c2d8c45ce09db9b2b69827266e3ac97b59f68556f086dcd0ccff5c625eb1cc815e51e16a66414949bc DIST hslogger-1.2.9.tar.gz 35576 SHA256 be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476 SHA512 6315dd7e6d6769a6a8fb8576b54875fbe79860d1e3158ddbca7f15b286f13b59cf7e817ac5325f31ae82e8f5328d32f22ee6aa37f5ae11e9070f209454ec801c WHIRLPOOL 92fed92bf3401ce37bb1df4c3a6bb13f4255aa71012fba4008188f470ce762fef967e973c16ff02a3dac7067a944bf7594ac6e1a42dc272efe3acb76c796fedd diff --git a/dev-haskell/hslogger/files/hslogger-1.2.1-dev-log-rdetect.patch b/dev-haskell/hslogger/files/hslogger-1.2.1-dev-log-rdetect.patch deleted file mode 100644 index 0da97310da1a..000000000000 --- a/dev-haskell/hslogger/files/hslogger-1.2.1-dev-log-rdetect.patch +++ /dev/null @@ -1,119 +0,0 @@ -Detect "/dev/log" socket type (Stream / Dgram) at runtime -as it does openlog from glibc. - -Patch based on report by George Diamantopoulos: - -https://groups.google.com/forum/#!topic/ganeti/xnj-WctN7HY/discussion - -Original bug report - -https://github.com/jgoerzen/hslogger/issues/1 - -Reported-by: George Diamantopoulos -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> -diff --git a/src/System/Log/Handler/Syslog.hs b/src/System/Log/Handler/Syslog.hs -index 52cbdc3..62337f8 100644 ---- a/src/System/Log/Handler/Syslog.hs -+++ b/src/System/Log/Handler/Syslog.hs -@@ -42,11 +42,12 @@ module System.Log.Handler.Syslog( - Option(..) - ) where - -+import qualified Control.Exception as E - import System.Log - import System.Log.Formatter - import System.Log.Handler - import Data.Bits --import Network.Socket -+import Network.Socket as S - import Network.BSD - import Data.List - #ifndef mingw32_HOST_OS -@@ -131,6 +132,7 @@ data SyslogHandler = SyslogHandler {options :: [Option], - identity :: String, - logsocket :: Socket, - address :: SockAddr, -+ sock_type :: SocketType, - priority :: Priority, - formatter :: LogFormatter SyslogHandler - } -@@ -171,9 +173,29 @@ openlog_local :: String -- ^ Path to FIFO - -> Priority -- ^ Priority limit - -> IO SyslogHandler - openlog_local fifopath ident options fac pri = -- do -- s <- socket AF_UNIX Datagram 0 -- openlog_generic s (SockAddrUnix fifopath) ident options fac pri -+ do (s, t) <- do -- "/dev/log" is usually Datagram, -+ -- but most of syslog loggers allow it to be -+ -- of Stream type. glibc's" openlog()" -+ -- does roughly the similar thing: -+ -- http://www.gnu.org/software/libc/manual/html_node/openlog.html -+ -+ s <- socket AF_UNIX Stream 0 -+ tryStream s `E.catch` (onIOException (fallbackToDgram s)) -+ openlog_generic s (SockAddrUnix fifopath) t ident options fac pri -+ -+ where onIOException :: IO a -> E.IOException -> IO a -+ onIOException a _ = a -+ -+ tryStream :: Socket -> IO (Socket, SocketType) -+ tryStream s = -+ do connect s (SockAddrUnix fifopath) -+ return (s, Stream) -+ -+ fallbackToDgram :: Socket -> IO (Socket, SocketType) -+ fallbackToDgram s = -+ do S.close s -- close Stream variant -+ d <- socket AF_UNIX Datagram 0 -+ return (d, Datagram) - #endif - - {- | Log to a remote server via UDP. -} -@@ -190,23 +212,25 @@ openlog_remote fam hostname port ident options fac pri = - he <- getHostByName hostname - s <- socket fam Datagram 0 - let addr = SockAddrInet port (head (hostAddresses he)) -- openlog_generic s addr ident options fac pri -- -+ openlog_generic s addr Datagram ident options fac pri -+ - {- | The most powerful initialization mechanism. Takes an open datagram - socket. -} - openlog_generic :: Socket -- ^ A datagram socket - -> SockAddr -- ^ Address for transmissions -+ -> SocketType -- ^ socket connection mode (stream / datagram) - -> String -- ^ Program name - -> [Option] -- ^ 'Option's - -> Facility -- ^ Facility value - -> Priority -- ^ Priority limit - -> IO SyslogHandler --openlog_generic sock addr ident opt fac pri = -+openlog_generic sock addr sock_t ident opt fac pri = - return (SyslogHandler {options = opt, - facility = fac, - identity = ident, - logsocket = sock, - address = addr, -+ sock_type = sock_t, - priority = pri, - formatter = syslogFormatter - }) -@@ -234,12 +258,14 @@ instance LogHandler SyslogHandler where - getLevel sh = priority sh - setFormatter sh f = sh{formatter = f} - getFormatter sh = formatter sh -- emit sh (_, msg) _ = -- let -+ emit sh (_, msg) _ = -+ let - sendstr :: String -> IO String - sendstr [] = return [] - sendstr omsg = do -- sent <- sendTo (logsocket sh) omsg (address sh) -+ sent <- case sock_type sh of -+ Datagram -> sendTo (logsocket sh) omsg (address sh) -+ Stream -> send (logsocket sh) omsg - sendstr (genericDrop sent omsg) - in do - if (elem PERROR (options sh)) diff --git a/dev-haskell/hslogger/hslogger-1.2.1-r2.ebuild b/dev-haskell/hslogger/hslogger-1.2.1-r2.ebuild deleted file mode 100644 index 29f2d10c1d36..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.1-r2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit eutils haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="http://software.complete.org/hslogger" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 ~sparc x86 ~amd64-linux" -IUSE="" - -RDEPEND="dev-haskell/mtl:=[profile?] - <dev-haskell/network-2.5:=[profile?] - >=dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" - -src_prepare() { - epatch "${FILESDIR}"/${P}-dev-log-rdetect.patch - epatch_user -} diff --git a/dev-haskell/hslogger/hslogger-1.2.1.ebuild b/dev-haskell/hslogger/hslogger-1.2.1.ebuild deleted file mode 100644 index f704965ab6d2..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="http://software.complete.org/hslogger" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 ~sparc x86 ~amd64-linux" -IUSE="" - -RDEPEND="dev-haskell/mtl:=[profile?] - <dev-haskell/network-2.5:=[profile?] - >=dev-lang/ghc-6.10.4:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" diff --git a/dev-haskell/hslogger/hslogger-1.2.3.ebuild b/dev-haskell/hslogger/hslogger-1.2.3.ebuild deleted file mode 100644 index 6d644f81ce83..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.3.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="https://github.com/jgoerzen/hslogger/wiki" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux" -IUSE="buildtests" - -RDEPEND="dev-haskell/mtl:=[profile?] - <dev-haskell/network-2.5:=[profile?] - >=dev-lang/ghc-6.12.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8.0.2 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag buildtests buildtests) -} diff --git a/dev-haskell/hslogger/hslogger-1.2.4.ebuild b/dev-haskell/hslogger/hslogger-1.2.4.ebuild deleted file mode 100644 index 8c8fe3b24dcb..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="http://software.complete.org/hslogger" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux" -IUSE="buildtests" - -RDEPEND="dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag buildtests buildtests) -} diff --git a/dev-haskell/hslogger/hslogger-1.2.6.ebuild b/dev-haskell/hslogger/hslogger-1.2.6.ebuild deleted file mode 100644 index 297437e148cb..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="http://software.complete.org/hslogger" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux" -IUSE="buildtests" - -RDEPEND="dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag buildtests buildtests) -} diff --git a/dev-haskell/hslogger/hslogger-1.2.8.ebuild b/dev-haskell/hslogger/hslogger-1.2.8.ebuild deleted file mode 100644 index 4bca691b84f5..000000000000 --- a/dev-haskell/hslogger/hslogger-1.2.8.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Versatile logging framework" -HOMEPAGE="http://software.complete.org/hslogger" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux" -IUSE="buildtests" - -RDEPEND="dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - dev-haskell/old-locale:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag buildtests buildtests) -} |