From: Matthias Kilian <k...@nutty.outback.escape.de> To: j...@openbsd.org Cc: ports@openbsd.org Bcc: Subject: Update www/hs-snap & related ports (includes two new ports) Reply-To:
Hi,
This contains the following updates (the recent update of
devel/hs-base64-bytestring is required to build them):
www/hs-snap 0.8.1 -> 0.9.2.2
www/hs-snap-server 0.8.1.1 -> 0.9.2.4
www/hs-snap-core 0.8.1 -> 0.9.2.2
www/hs-clientsession 0.7.3.6 -> 0.8.0.1
security/hs-pwstore-fast 2.2 -> 2.3
Some functionality previously included within www/hs-snap has now
moved to two new ports (attached), www/hs-snap-loader-dynamic and
www/hs-snap-loader-static. Those libraries aren't mentioned in
snap.cabal, but I think www/hs-snap should still depend on them,
because they are required by any project created by "snap init".
Diffs and attached ports are relative to /usr/ports.
comments / oks?
Ciao,
Kili
Index: www/hs-snap/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/hs-snap/Makefile 11 Oct 2012 14:45:53 -0000 1.6
+++ www/hs-snap/Makefile 17 Oct 2012 20:41:10 -0000
@@ -2,8 +2,7 @@
COMMENT = Snap project starter and glue code library
-DISTNAME = snap-0.8.1
-REVISION = 0
+DISTNAME = snap-0.9.2.2
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -32,29 +31,31 @@ RUN_DEPENDS += devel/hs-MonadCatchIO-tr
devel/hs-configurator>=0.1,<0.3 \
devel/hs-data-lens>=2.0.1,<2.11 \
devel/hs-data-lens-template>=2.1,<2.2 \
- devel/hs-directory-tree>=0.10,<0.11 \
+ devel/hs-directory-tree>=0.10,<0.12 \
devel/hs-hashable>=1.1,<1.2 \
- devel/hs-hint>=0.3.3.1,<0.4 \
devel/hs-logict>=0.4.2,<0.6 \
devel/hs-mtl>2.0,<2.2 \
- devel/hs-safe>=0.3,<0.4 \
- devel/hs-stm>=2.2,<2.4 \
+ devel/hs-stm>=2.2,<2.5 \
devel/hs-syb>=0.1,<0.4 \
devel/hs-text>=0.11,<0.12 \
devel/hs-transformers>=0.2,<0.4 \
devel/hs-unordered-containers>=0.1.4,<0.3 \
+ devel/hs-vector>=0.7.1,<0.11 \
devel/hs-vector-algorithms>=0.4,<0.6 \
- devel/hs-vector>=0.7.1,<0.10 \
- security/hs-crypto>=4.2,<4.3 \
security/hs-mwc-random>=0.8,<0.13 \
- security/hs-pwstore-fast>=2.2,<2.3 \
- security/hs-skein>=0.1.0.3,<0.2 \
+ security/hs-pwstore-fast>=2.3,<2.4 \
textproc/hs-attoparsec>=0.10,<0.11 \
textproc/hs-heist>=0.7,<0.9 \
- textproc/hs-xmlhtml>=0.1,<0.2.1 \
- www/hs-clientsession>=0.7.3.6,<0.8 \
- www/hs-snap-core>=0.8.1,<0.9 \
- www/hs-snap-server>=0.8.1,<0.9 \
+ textproc/hs-xmlhtml>=0.1,<0.3 \
+ www/hs-clientsession>=0.8,<0.9 \
+ www/hs-snap-core>=0.9.2,<0.10 \
+ www/hs-snap-server>=0.9.2,<0.10
+
+# Those are NOT mentioned in snap.cabal, but they are required by
+# default snap projects created with "snap init", so it's probably a
+# good idea to add them:
+RUN_DEPENDS += www/hs-snap-loader-dynamic \
+ www/hs-snap-loader-static
BUILD_DEPENDS += ${RUN_DEPENDS}
Index: www/hs-snap/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-snap/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- www/hs-snap/distinfo 2 Sep 2012 21:51:15 -0000 1.3
+++ www/hs-snap/distinfo 17 Oct 2012 20:41:10 -0000
@@ -1,5 +1,2 @@
-MD5 (ghc/snap-0.8.1.tar.gz) = SUthx8EQ2HzG7za9mGab7Q==
-RMD160 (ghc/snap-0.8.1.tar.gz) = EelbqXGEQrc/Zm6H66WjJ7uXQu8=
-SHA1 (ghc/snap-0.8.1.tar.gz) = d8q684R34b25+rBEIxAsjT9zIpU=
-SHA256 (ghc/snap-0.8.1.tar.gz) = lKOzeFa41qysr1YygNP3OM3tgo9PKWSE9WaKVHb2q+w=
-SIZE (ghc/snap-0.8.1.tar.gz) = 76665
+SHA256 (ghc/snap-0.9.2.2.tar.gz) = XP/UyAua+sNWYZKmMa4+CKrYCL0xak75R41llRZiieI=
+SIZE (ghc/snap-0.9.2.2.tar.gz) = 73548
Index: www/hs-snap/patches/patch-snap_cabal
===================================================================
RCS file: www/hs-snap/patches/patch-snap_cabal
diff -N www/hs-snap/patches/patch-snap_cabal
--- www/hs-snap/patches/patch-snap_cabal 2 Sep 2012 21:51:15 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-snap_cabal,v 1.1 2012/09/02 21:51:15 kili Exp $
---- snap.cabal.orig Sat Apr 21 17:18:53 2012
-+++ snap.cabal Thu Jul 12 22:21:34 2012
-@@ -162,7 +162,7 @@ Library
- utf8-string >= 0.3 && < 0.4,
- vector >= 0.7.1 && < 0.10,
- vector-algorithms >= 0.4 && < 0.6,
-- xmlhtml >= 0.1 && < 0.2
-+ xmlhtml >= 0.1 && < 0.2.1
-
- extensions:
- BangPatterns,
Index: www/hs-snap/pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/hs-snap/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- www/hs-snap/pkg/DESCR 24 Sep 2011 19:05:32 -0000 1.1.1.1
+++ www/hs-snap/pkg/DESCR 17 Oct 2012 20:41:10 -0000
@@ -1,2 +1,5 @@
-Snap skeleton project generator and the snap library containing
-convenience functions and support code for the generator.
+This is the top-level package for the official Snap Framework
+libraries. It includes:
+* The Snaplets API
+* The "snap" executable program for generating starter projects
+* Snaplets for sessions, authentication, and templates
Index: www/hs-snap/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/hs-snap/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- www/hs-snap/pkg/PLIST 2 Sep 2012 21:51:15 -0000 1.3
+++ www/hs-snap/pkg/PLIST 17 Oct 2012 20:41:10 -0000
@@ -15,13 +15,6 @@ lib/ghc/${DISTNAME}/Control/Access/RoleB
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/Snap/
lib/ghc/${DISTNAME}/Snap.hi
-lib/ghc/${DISTNAME}/Snap/Loader/
-lib/ghc/${DISTNAME}/Snap/Loader/Devel/
-lib/ghc/${DISTNAME}/Snap/Loader/Devel.hi
-lib/ghc/${DISTNAME}/Snap/Loader/Devel/Evaluator.hi
-lib/ghc/${DISTNAME}/Snap/Loader/Devel/Signal.hi
-lib/ghc/${DISTNAME}/Snap/Loader/Devel/TreeWatcher.hi
-lib/ghc/${DISTNAME}/Snap/Loader/Prod.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/
lib/ghc/${DISTNAME}/Snap/Snaplet.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/Auth/
@@ -32,6 +25,7 @@ lib/ghc/${DISTNAME}/Snap/Snaplet/Auth/Ba
lib/ghc/${DISTNAME}/Snap/Snaplet/Auth/Handlers.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/Auth/SpliceHelpers.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/Auth/Types.hi
+lib/ghc/${DISTNAME}/Snap/Snaplet/Config.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/Heist.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/HeistNoClass.hi
lib/ghc/${DISTNAME}/Snap/Snaplet/Internal/
@@ -55,10 +49,9 @@ lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
-share/doc/hs-${DISTNAME}/html/Snap-Loader-Devel.html
-share/doc/hs-${DISTNAME}/html/Snap-Loader-Prod.html
share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Auth-Backends-JsonFile.html
share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Auth.html
+share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Config.html
share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Heist.html
share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Session-Backends-CookieSession.html
share/doc/hs-${DISTNAME}/html/Snap-Snaplet-Session-Common.html
@@ -100,10 +93,9 @@ share/doc/hs-${DISTNAME}/html/haddock-ut
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
-share/doc/hs-${DISTNAME}/html/mini_Snap-Loader-Devel.html
-share/doc/hs-${DISTNAME}/html/mini_Snap-Loader-Prod.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Auth-Backends-JsonFile.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Auth.html
+share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Config.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Heist.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Session-Backends-CookieSession.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Snaplet-Session-Common.html
Index: www/hs-snap-core/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/hs-snap-core/Makefile 2 Sep 2012 21:40:12 -0000 1.15
+++ www/hs-snap-core/Makefile 17 Oct 2012 20:41:10 -0000
@@ -2,7 +2,7 @@
COMMENT = Snap Haskell Web Framework
-DISTNAME = snap-core-0.8.1
+DISTNAME = snap-core-0.9.2.2
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -31,12 +31,13 @@ RUN_DEPENDS += archivers/hs-zlib-enum>=
devel/hs-enumerator>=0.4.15,<0.5 \
devel/hs-MonadCatchIO-transformers>=0.2.1,<0.4 \
devel/hs-mtl>=2.0,<2.2 \
- devel/hs-regex-posix>=0,<=0.95.2 \
+ devel/hs-random>=1,<2 \
+ devel/hs-regex-posix>=0.95,<1 \
devel/hs-text>=0.11,<0.12 \
devel/hs-transformers>=0.2,<0.4 \
- devel/hs-unix-compat>=0.2,<0.4 \
+ devel/hs-unix-compat>=0.2,<0.5 \
devel/hs-unordered-containers>=0.1.4.3,<0.3 \
- devel/hs-vector>=0.6,<0.10 \
+ devel/hs-vector>=0.6,<0.11 \
security/hs-mwc-random>=0.10,<0.13 \
textproc/hs-attoparsec>=0.10,<0.11 \
textproc/hs-attoparsec-enumerator>=0.3,<0.4 \
Index: www/hs-snap-core/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- www/hs-snap-core/distinfo 2 Sep 2012 21:40:12 -0000 1.7
+++ www/hs-snap-core/distinfo 17 Oct 2012 20:41:10 -0000
@@ -1,5 +1,2 @@
-MD5 (ghc/snap-core-0.8.1.tar.gz) = 78lFg3U28wQKC6SuTJb51g==
-RMD160 (ghc/snap-core-0.8.1.tar.gz) = pIcW0srScJ3rM6d4Xet3YkZwMQU=
-SHA1 (ghc/snap-core-0.8.1.tar.gz) = E0EWFu5+GM46KF5lG5e5H4t/Ktw=
-SHA256 (ghc/snap-core-0.8.1.tar.gz) =
K3QHMcFKfEHV6RIpfthZiZcVp/WVvRPl3zgQ8VP7JIc=
-SIZE (ghc/snap-core-0.8.1.tar.gz) = 88998
+SHA256 (ghc/snap-core-0.9.2.2.tar.gz) =
jtYIAvwTGZgCegJmFtPn9YUAMd7yae/6QVLFK2CEams=
+SIZE (ghc/snap-core-0.9.2.2.tar.gz) = 91227
Index: www/hs-snap-server/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/hs-snap-server/Makefile 2 Sep 2012 21:48:31 -0000 1.14
+++ www/hs-snap-server/Makefile 17 Oct 2012 20:41:10 -0000
@@ -2,7 +2,7 @@
COMMENT = Snap Haskell Web Framework Server
-DISTNAME = snap-server-0.8.1.1
+DISTNAME = snap-server-0.9.2.4
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -28,17 +28,17 @@ RUN_DEPENDS += devel/hs-binary>=0.5,<0.
devel/hs-MonadCatchIO-transformers>=0.2.1,<0.4 \
devel/hs-murmur-hash>=0.1,<0.2 \
devel/hs-mtl>=2,<3 \
- devel/hs-network>=2.3,<2.4 \
+ devel/hs-network>=2.3,<2.5 \
devel/hs-PSQueue>=1.1,<1.2 \
devel/hs-transformers>=0.2,<0.4 \
devel/hs-text>=0.11,<0.12 \
- devel/hs-unix-compat>=0.2,<0.4 \
+ devel/hs-unix-compat>=0.2,<0.5 \
devel/hs-vector>=0.7,<0.10 \
devel/hs-vector-algorithms>=0.4,<0.6 \
textproc/hs-attoparsec>=0.10,<0.11 \
textproc/hs-attoparsec-enumerator>=0.3,<0.4 \
textproc/hs-bytestring-nums \
- www/hs-snap-core>=0.8.1,<0.9
+ www/hs-snap-core>=0.9.2,<0.10
BUILD_DEPENDS += ${RUN_DEPENDS}
.include <bsd.port.mk>
Index: www/hs-snap-server/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- www/hs-snap-server/distinfo 2 Sep 2012 21:48:31 -0000 1.7
+++ www/hs-snap-server/distinfo 17 Oct 2012 20:41:10 -0000
@@ -1,5 +1,2 @@
-MD5 (ghc/snap-server-0.8.1.1.tar.gz) = 2DZRouiLWJTI7/05z6lTJg==
-RMD160 (ghc/snap-server-0.8.1.1.tar.gz) = plu89XHWqXIvpZbjo9XydToVKzs=
-SHA1 (ghc/snap-server-0.8.1.1.tar.gz) = 15Hl1iCalAJ6fFdsRGabuoCwBns=
-SHA256 (ghc/snap-server-0.8.1.1.tar.gz) =
hmg+1Dm3ytKSt8XV4S0SEx7Gm91d9WjQtosYBl36h0w=
-SIZE (ghc/snap-server-0.8.1.1.tar.gz) = 63196
+SHA256 (ghc/snap-server-0.9.2.4.tar.gz) =
9MNW8bdGge1r+Afl3Ckv3HITUrZOFYANHAPklibNlc8=
+SIZE (ghc/snap-server-0.9.2.4.tar.gz) = 56202
Index: www/hs-snap-server/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- www/hs-snap-server/pkg/PLIST 28 Apr 2012 19:33:06 -0000 1.6
+++ www/hs-snap-server/pkg/PLIST 17 Oct 2012 20:41:10 -0000
@@ -1,8 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2012/04/28 19:33:06 kili Exp $
lib/ghc/${DISTNAME}/
-lib/ghc/${DISTNAME}/Data/
-lib/ghc/${DISTNAME}/Data/Concurrent/
-lib/ghc/${DISTNAME}/Data/Concurrent/HashMap.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/Paths_snap_server.hi
lib/ghc/${DISTNAME}/Snap/
@@ -17,9 +14,9 @@ lib/ghc/${DISTNAME}/Snap/Internal/Http/S
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Address.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Backend.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Config.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Date.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/HttpPort.hi
-lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/LibevBackend.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/ListenHelpers.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/SimpleBackend.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/TLS.hi
Index: www/hs-clientsession/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-clientsession/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/hs-clientsession/Makefile 12 Oct 2012 14:02:21 -0000 1.2
+++ www/hs-clientsession/Makefile 17 Oct 2012 20:41:10 -0000
@@ -2,10 +2,12 @@
COMMENT = securely store session data in a client-side cookie
-DISTNAME = clientsession-0.7.3.6
-REVISION = 0
+DISTNAME = clientsession-0.8.0.1
CATEGORIES = security www
+MAINTAINER = Jim Razmus II <j...@openbsd.org>, \
+ Matthias Kilian <k...@openbsd.org>
+
# BSD3
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
@@ -16,11 +18,11 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-RUN_DEPENDS = devel/hs-base64-bytestring>=0.1.0.3,<0.2 \
- devel/hs-cereal>=0.3,<0.4 \
+RUN_DEPENDS = devel/hs-base64-bytestring>=0.1.1.1 \
+ devel/hs-cereal>=0.3 \
devel/hs-tagged>=0.1 \
security/hs-cprng-aes>=0.2 \
- security/hs-crypto-api>=0.6.4,<0.9 \
+ security/hs-crypto-api>=0.8 \
security/hs-cryptocipher>=0.2.5 \
security/hs-entropy>=0.2.1 \
security/hs-skein>=0.1,<0.2
Index: www/hs-clientsession/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-clientsession/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- www/hs-clientsession/distinfo 28 Apr 2012 19:23:06 -0000 1.1.1.1
+++ www/hs-clientsession/distinfo 17 Oct 2012 20:41:10 -0000
@@ -1,5 +1,2 @@
-MD5 (ghc/clientsession-0.7.3.6.tar.gz) = P8bb+McWKcQhnsBlIHv5jA==
-RMD160 (ghc/clientsession-0.7.3.6.tar.gz) = F+tE3aerqybj7fJko9soQ6JUzVM=
-SHA1 (ghc/clientsession-0.7.3.6.tar.gz) = ZlS9W/lp77c2pLnZ5GqVtkc/L6A=
-SHA256 (ghc/clientsession-0.7.3.6.tar.gz) =
7MGAn2wd/vMalTq9DovBWO7kJr5BenHRzKNeAY/mmxE=
-SIZE (ghc/clientsession-0.7.3.6.tar.gz) = 7013
+SHA256 (ghc/clientsession-0.8.0.1.tar.gz) =
u+dyY7bBKjz3KtPZwUZd7KjZOO2yxt0VnIpcP3kJ0mQ=
+SIZE (ghc/clientsession-0.8.0.1.tar.gz) = 7024
Index: security/hs-pwstore-fast/Makefile
===================================================================
RCS file: /cvs/ports/security/hs-pwstore-fast/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- security/hs-pwstore-fast/Makefile 2 Sep 2012 20:02:43 -0000 1.2
+++ security/hs-pwstore-fast/Makefile 17 Oct 2012 20:41:10 -0000
@@ -2,8 +2,7 @@
COMMENT = secure password storage
-DISTNAME = pwstore-fast-2.2
-REVISION = 0
+DISTNAME = pwstore-fast-2.3
CATEGORIES = security
# BSD3
Index: security/hs-pwstore-fast/distinfo
===================================================================
RCS file: /cvs/ports/security/hs-pwstore-fast/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- security/hs-pwstore-fast/distinfo 22 Jan 2012 17:16:57 -0000 1.1.1.1
+++ security/hs-pwstore-fast/distinfo 17 Oct 2012 20:41:10 -0000
@@ -1,5 +1,2 @@
-MD5 (ghc/pwstore-fast-2.2.tar.gz) = bfDacgQWZhOqYM5th/DUTQ==
-RMD160 (ghc/pwstore-fast-2.2.tar.gz) = QxEXMr9fTC67Z2utlT9xi9AxbZA=
-SHA1 (ghc/pwstore-fast-2.2.tar.gz) = sanAdJQsu3nBU2lXceAf3poVN0A=
-SHA256 (ghc/pwstore-fast-2.2.tar.gz) =
yqROE/J0b5zw77OyvwGUBktSZ1oo08FN3E0xI0veaQ0=
-SIZE (ghc/pwstore-fast-2.2.tar.gz) = 6565
+SHA256 (ghc/pwstore-fast-2.3.tar.gz) =
fMX0g+PS4uXgyfC28OkezMl+tu2Wt+nOAOVdCoAllAQ=
+SIZE (ghc/pwstore-fast-2.3.tar.gz) = 6739
www_hs-snap-loader-dynamic.tgz
Description: application/tar-gz
www_hs-snap-loader-static.tgz
Description: application/tar-gz
