1 files changed, 105 insertions, 155 deletions
diff --git a/presence.cabal b/presence.cabal
index cde0262f..921f0cef 100644
--- a/presence.cabal
+++ b/presence.cabal
@@ -1,6 +1,6 @@
 name: presence
 version: 0.0.1
-cabal-version: >=1.2
+cabal-version: >=1.8
 build-type: Simple
 license: AllRightsReserved
 synopsis: XMPP Server which detects unix logins
@@ -11,185 +11,135 @@ description: When users login to your localhost, their presence is detected and
             road, extended again to make use of Jingle to facilitate VOIP.
 author: Joe Crayne
 data-dir: ""
- 
-executable presence
+library
-    buildable: True
    cpp-options: -DRENDERFLUSH
    c-sources: Presence/monitortty.c
    hs-source-dirs: . Presence
    ghc-prof-options: -DNOUTMP
    ghc-options: -O2 -fwarn-unused-binds -threaded
-    build-depends: base,
+    hs-source-dirs: . Presence
-                   binary,
+    build-depends:
-                   blaze-builder,
+        base,
-                   bytestring,
+        binary,
-                   conduit (>=1.0.4),
+        blaze-builder,
-                   conduit-extra,
+        bytestring,
-                   containers,
+        conduit (>=1.0.4),
-                   cpu,
+        conduit-extra,
-                   data-default,
+        containers,
-                   deepseq,
+        cpu,
-                   directory,
+        deepseq,
-                   filepath,
+        directory,
-                   hinotify,
+        filepath,
-                   mmorph,
+        hinotify,
-                   mtl,
+        mtl,
-                   network,
+        network,
-                   process,
+        process,
-                   random,
+        random,
-                   resourcet,
+        resourcet,
-                   stm,
+        stm,
-                   template-haskell,
+        template-haskell,
-                   text (>=0.11.2.0),
+        text (>=0.11.2.0),
-                   time,
+        time,
-                   transformers,
+        transformers,
-                   unix,
+        unix,
-                   void,
+        xml-conduit,
-                   xml-conduit,
+        xml-types
-                   xml-types
+    exposed-modules:
+        ByteStringOperators,
+        ClientState,
+        ConfigFiles,
+        ConnectionKey,
+        ConsoleWriter,
+        Control.Concurrent.STM.StatusCache,
+        Control.Concurrent.STM.UpdateStream,
+        ControlMaybe,
+        Data.BitSyntax,
+        DNSCache,
+        EventUtil,
+        FGConsole,
+        GetHostByAddr,
+        LocalPeerCred,
+        LockedChan,
+        Logging,
+        Nesting,
+        Paths,
+        PeerResolve,
+        Server,
+        SockAddr,
+        SocketLike,
+        TraversableT,
+        UTmp,
+        XMPPServer
+ 
+executable presence
    main-is: xmppServer.hs
-    other-modules: ByteStringOperators,
+    buildable: True
-                   ClientState,
+    cpp-options: -DRENDERFLUSH
-                   ConfigFiles,
+    hs-source-dirs: .
-                   ConnectionKey,
+    ghc-prof-options: -DNOUTMP
-                   ConsoleWriter,
+    ghc-options: -O2 -fwarn-unused-binds -threaded
-                   Control.Concurrent.STM.StatusCache,
+    build-depends:
-                   Control.Concurrent.STM.UpdateStream,
+        base, presence,
-                   ControlMaybe,
+        bytestring,
-                   Data.BitSyntax,
+        containers,
-                   DNSCache,
+        cpu,
-                   EventUtil,
+        mtl,
-                   FGConsole,
+        network,
-                   GetHostByAddr,
+        resourcet,
-                   LocalPeerCred,
+        stm,
-                   LockedChan,
+        text (>=0.11.2.0),
-                   Logging,
+        transformers,
-                   Nesting,
+        unix
-                   Paths,
-                   PeerResolve,
-                   Server,
-                   SockAddr,
-                   SocketLike,
-                   TraversableT,
-                   UTmp,
-                   XMPPServer
 
 executable whosocket
    main-is: whosocket.hs
-    hs-source-dirs: . Presence
+    hs-source-dirs: .
    cpp-options: -DRENDERFLUSH
    ghc-options: -O2 -fwarn-unused-binds -threaded
-    build-depends: base,
+    build-depends:
-                   binary,
+        base, presence,
-                   bytestring,
+        bytestring,
-                   containers,
+        cpu,
-                   cpu,
+        directory,
-                   deepseq,
+        network,
-                   directory,
+        unix
-                   mtl,
-                   network,
-                   template-haskell,
-                   text (>=0.11.2.0),
-                   unix
-    other-modules: ByteStringOperators,
-                   ControlMaybe,
-                   Data.BitSyntax,
-                   LocalPeerCred,
-                   Logging,
-                   Paths,
-                   SockAddr,
-                   SocketLike,
-                   UTmp
 executable nalias2
    main-is: nalias2.hs
-    hs-source-dirs: . Presence
+    hs-source-dirs: .
    ghc-options: -O2 -fwarn-unused-binds -threaded
-    build-depends: base,
+    build-depends: base, presence, text (>=0.11.2.0)
-                   text (>=0.11.2.0)
-    other-modules: DNSCache, ControlMaybe, GetHostByAddr, SockAddr
 executable consolation
    main-is: consolation.hs
-    hs-source-dirs: . Presence
+    hs-source-dirs: .
    ghc-options: -O2 -fwarn-unused-binds -threaded
    cpp-options: -DRENDERFLUSH
-    c-sources: Presence/monitortty.c
+    build-depends:
-    build-depends: base,
+        base, presence,
-                   binary,
+        bytestring,
-                   blaze-builder,
+        containers,
-                   bytestring,
+        cpu,
-                   conduit (>=1.0.4),
+        mtl,
-                   conduit-extra,
+        network,
-                   containers,
+        resourcet,
-                   cpu,
+        stm,
-                   data-default,
+        text (>=0.11.2.0),
-                   deepseq,
+        transformers,
-                   directory,
+        unix
-                   filepath,
-                   hinotify,
-                   mmorph,
-                   mtl,
-                   network,
-                   process,
-                   random,
-                   resourcet,
-                   stm,
-                   template-haskell,
-                   text (>=0.11.2.0),
-                   time,
-                   transformers,
-                   unix,
-                   void,
-                   xml-conduit,
-                   xml-types
    main-is: xmppServer.hs
-    other-modules: ByteStringOperators,
-                   ClientState,
-                   ConfigFiles,
-                   ConnectionKey,
-                   ConsoleWriter,
-                   Control.Concurrent.STM.StatusCache,
-                   Control.Concurrent.STM.UpdateStream,
-                   ControlMaybe,
-                   DNSCache,
-                   Data.BitSyntax,
-                   EventUtil,
-                   FGConsole,
-                   GetHostByAddr,
-                   LocalPeerCred,
-                   LockedChan,
-                   Logging,
-                   Nesting,
-                   Paths,
-                   PeerResolve,
-                   Server,
-                   SockAddr,
-                   SocketLike,
-                   TraversableT,
-                   UTmp,
-                   XMPPServer
 executable pwrite
    main-is: pwrite.hs
-    hs-source-dirs: . Presence
+    hs-source-dirs: .
    ghc-options: -O2 -fwarn-unused-binds -threaded
-    build-depends: base,
+    build-depends:
-                   text (>=0.11.2.0)
+        base,
-    other-modules: ConnectionKey,
+        presence,
-                   Control.Concurrent.STM.StatusCache,
+        text (>=0.11.2.0),
-                   Control.Concurrent.STM.UpdateStream,
+        unix
-                   ControlMaybe,
-                   DNSCache,
-                   EventUtil,
-                   GetHostByAddr,
-                   LockedChan,
-                   Nesting,
-                   PeerResolve,
-                   Server,
-                   SockAddr,
-                   XMPPServer
 -- [ ] ConduitServer.hs:main = mainC
 -- [ ] Control/Concurrent/STM/StatusCache.hs:-- > main = do q <- atomically $ Cache.new (== '(') (==')')
 -- [ ] Control/Concurrent/STM/UpdateStream.hs:-- > main = do

diff --git a/presence.cabal b/presence.cabal index cde0262f..921f0cef 100644 --- a/presence.cabal +++ b/presence.cabal
@@ -1,6 +1,6 @@
1	name: presence	1	name: presence
2	version: 0.0.1	2	version: 0.0.1
3	cabal-version: >=1.2	3	cabal-version: >=1.8
4	build-type: Simple	4	build-type: Simple
5	license: AllRightsReserved	5	license: AllRightsReserved
6	synopsis: XMPP Server which detects unix logins	6	synopsis: XMPP Server which detects unix logins
@@ -11,185 +11,135 @@ description: When users login to your localhost, their presence is detected and
11	road, extended again to make use of Jingle to facilitate VOIP.	11	road, extended again to make use of Jingle to facilitate VOIP.
12	author: Joe Crayne	12	author: Joe Crayne
13	data-dir: ""	13	data-dir: ""
14		14
15	executable presence	15	library
16	buildable: True
17	cpp-options: -DRENDERFLUSH	16	cpp-options: -DRENDERFLUSH
18	c-sources: Presence/monitortty.c	17	c-sources: Presence/monitortty.c
19	hs-source-dirs: . Presence	18	hs-source-dirs: . Presence
20	ghc-prof-options: -DNOUTMP	19	ghc-prof-options: -DNOUTMP
21	ghc-options: -O2 -fwarn-unused-binds -threaded	20	ghc-options: -O2 -fwarn-unused-binds -threaded
22	build-depends: base,	21	hs-source-dirs: . Presence
23	binary,	22	build-depends:
24	blaze-builder,	23	base,
25	bytestring,	24	binary,
26	conduit (>=1.0.4),	25	blaze-builder,
27	conduit-extra,	26	bytestring,
28	containers,	27	conduit (>=1.0.4),
29	cpu,	28	conduit-extra,
30	data-default,	29	containers,
31	deepseq,	30	cpu,
32	directory,	31	deepseq,
33	filepath,	32	directory,
34	hinotify,	33	filepath,
35	mmorph,	34	hinotify,
36	mtl,	35	mtl,
37	network,	36	network,
38	process,	37	process,
39	random,	38	random,
40	resourcet,	39	resourcet,
41	stm,	40	stm,
42	template-haskell,	41	template-haskell,
43	text (>=0.11.2.0),	42	text (>=0.11.2.0),
44	time,	43	time,
45	transformers,	44	transformers,
46	unix,	45	unix,
47	void,	46	xml-conduit,
48	xml-conduit,	47	xml-types
49	xml-types	48	exposed-modules:
		49	ByteStringOperators,
		50	ClientState,
		51	ConfigFiles,
		52	ConnectionKey,
		53	ConsoleWriter,
		54	Control.Concurrent.STM.StatusCache,
		55	Control.Concurrent.STM.UpdateStream,
		56	ControlMaybe,
		57	Data.BitSyntax,
		58	DNSCache,
		59	EventUtil,
		60	FGConsole,
		61	GetHostByAddr,
		62	LocalPeerCred,
		63	LockedChan,
		64	Logging,
		65	Nesting,
		66	Paths,
		67	PeerResolve,
		68	Server,
		69	SockAddr,
		70	SocketLike,
		71	TraversableT,
		72	UTmp,
		73	XMPPServer
		74
		75	executable presence
50	main-is: xmppServer.hs	76	main-is: xmppServer.hs
51	other-modules: ByteStringOperators,	77	buildable: True
52	ClientState,	78	cpp-options: -DRENDERFLUSH
53	ConfigFiles,	79	hs-source-dirs: .
54	ConnectionKey,	80	ghc-prof-options: -DNOUTMP
55	ConsoleWriter,	81	ghc-options: -O2 -fwarn-unused-binds -threaded
56	Control.Concurrent.STM.StatusCache,	82	build-depends:
57	Control.Concurrent.STM.UpdateStream,	83	base, presence,
58	ControlMaybe,	84	bytestring,
59	Data.BitSyntax,	85	containers,
60	DNSCache,	86	cpu,
61	EventUtil,	87	mtl,
62	FGConsole,	88	network,
63	GetHostByAddr,	89	resourcet,
64	LocalPeerCred,	90	stm,
65	LockedChan,	91	text (>=0.11.2.0),
66	Logging,	92	transformers,
67	Nesting,	93	unix
68	Paths,
69	PeerResolve,
70	Server,
71	SockAddr,
72	SocketLike,
73	TraversableT,
74	UTmp,
75	XMPPServer
76		94
77	executable whosocket	95	executable whosocket
78	main-is: whosocket.hs	96	main-is: whosocket.hs
79	hs-source-dirs: . Presence	97	hs-source-dirs: .
80	cpp-options: -DRENDERFLUSH	98	cpp-options: -DRENDERFLUSH
81	ghc-options: -O2 -fwarn-unused-binds -threaded	99	ghc-options: -O2 -fwarn-unused-binds -threaded
82	build-depends: base,	100	build-depends:
83	binary,	101	base, presence,
84	bytestring,	102	bytestring,
85	containers,	103	cpu,
86	cpu,	104	directory,
87	deepseq,	105	network,
88	directory,	106	unix
89	mtl,
90	network,
91	template-haskell,
92	text (>=0.11.2.0),
93	unix
94	other-modules: ByteStringOperators,
95	ControlMaybe,
96	Data.BitSyntax,
97	LocalPeerCred,
98	Logging,
99	Paths,
100	SockAddr,
101	SocketLike,
102	UTmp
103		107
104	executable nalias2	108	executable nalias2
105	main-is: nalias2.hs	109	main-is: nalias2.hs
106	hs-source-dirs: . Presence	110	hs-source-dirs: .
107	ghc-options: -O2 -fwarn-unused-binds -threaded	111	ghc-options: -O2 -fwarn-unused-binds -threaded
108	build-depends: base,	112	build-depends: base, presence, text (>=0.11.2.0)
109	text (>=0.11.2.0)
110	other-modules: DNSCache, ControlMaybe, GetHostByAddr, SockAddr
111
112		113
113	executable consolation	114	executable consolation
114	main-is: consolation.hs	115	main-is: consolation.hs
115	hs-source-dirs: . Presence	116	hs-source-dirs: .
116	ghc-options: -O2 -fwarn-unused-binds -threaded	117	ghc-options: -O2 -fwarn-unused-binds -threaded
117	cpp-options: -DRENDERFLUSH	118	cpp-options: -DRENDERFLUSH
118	c-sources: Presence/monitortty.c	119	build-depends:
119	build-depends: base,	120	base, presence,
120	binary,	121	bytestring,
121	blaze-builder,	122	containers,
122	bytestring,	123	cpu,
123	conduit (>=1.0.4),	124	mtl,
124	conduit-extra,	125	network,
125	containers,	126	resourcet,
126	cpu,	127	stm,
127	data-default,	128	text (>=0.11.2.0),
128	deepseq,	129	transformers,
129	directory,	130	unix
130	filepath,
131	hinotify,
132	mmorph,
133	mtl,
134	network,
135	process,
136	random,
137	resourcet,
138	stm,
139	template-haskell,
140	text (>=0.11.2.0),
141	time,
142	transformers,
143	unix,
144	void,
145	xml-conduit,
146	xml-types
147	main-is: xmppServer.hs	131	main-is: xmppServer.hs
148	other-modules: ByteStringOperators,
149	ClientState,
150	ConfigFiles,
151	ConnectionKey,
152	ConsoleWriter,
153	Control.Concurrent.STM.StatusCache,
154	Control.Concurrent.STM.UpdateStream,
155	ControlMaybe,
156	DNSCache,
157	Data.BitSyntax,
158	EventUtil,
159	FGConsole,
160	GetHostByAddr,
161	LocalPeerCred,
162	LockedChan,
163	Logging,
164	Nesting,
165	Paths,
166	PeerResolve,
167	Server,
168	SockAddr,
169	SocketLike,
170	TraversableT,
171	UTmp,
172	XMPPServer
173		132
174	executable pwrite	133	executable pwrite
175	main-is: pwrite.hs	134	main-is: pwrite.hs
176	hs-source-dirs: . Presence	135	hs-source-dirs: .
177	ghc-options: -O2 -fwarn-unused-binds -threaded	136	ghc-options: -O2 -fwarn-unused-binds -threaded
178	build-depends: base,	137	build-depends:
179	text (>=0.11.2.0)	138	base,
180	other-modules: ConnectionKey,	139	presence,
181	Control.Concurrent.STM.StatusCache,	140	text (>=0.11.2.0),
182	Control.Concurrent.STM.UpdateStream,	141	unix
183	ControlMaybe,	142
184	DNSCache,
185	EventUtil,
186	GetHostByAddr,
187	LockedChan,
188	Nesting,
189	PeerResolve,
190	Server,
191	SockAddr,
192	XMPPServer
193	-- [ ] ConduitServer.hs:main = mainC	143	-- [ ] ConduitServer.hs:main = mainC
194	-- [ ] Control/Concurrent/STM/StatusCache.hs:-- > main = do q <- atomically $ Cache.new (== '(') (==')')	144	-- [ ] Control/Concurrent/STM/StatusCache.hs:-- > main = do q <- atomically $ Cache.new (== '(') (==')')
195	-- [ ] Control/Concurrent/STM/UpdateStream.hs:-- > main = do	145	-- [ ] Control/Concurrent/STM/UpdateStream.hs:-- > main = do