[pkgsrc/trunk]: pkgsrc/mail/prayer Changes 1.3.2:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9539ea85edf8
branches:  trunk
changeset: 576369:9539ea85edf8
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Jun 08 12:34:38 2010 +0000

description:
Changes 1.3.2:
- security fixes
- various bug fixes and small improvements
- new XHTML strict template tree
- add UTF-8 support
- add IPv6 support
- add Raven single sign-on authentication

diffstat:

 mail/prayer/Makefile         |   38 +++++++------
 mail/prayer/PLIST            |  113 +++++++++++++++++++++++++-----------------
 mail/prayer/distinfo         |   28 +++++----
 mail/prayer/files/prayer.sh  |    4 +-
 mail/prayer/patches/patch-aa |   72 +++++++++++++++-----------
 mail/prayer/patches/patch-ab |   24 ++++----
 mail/prayer/patches/patch-ac |   20 ++----
 mail/prayer/patches/patch-ad |   47 ++---------------
 mail/prayer/patches/patch-ae |   46 +++++-----------
 mail/prayer/patches/patch-af |   36 +++---------
 mail/prayer/patches/patch-ag |    8 +-
 mail/prayer/patches/patch-ah |   16 +++---
 mail/prayer/patches/patch-ai |    8 +-
 mail/prayer/patches/patch-aj |   13 ++++
 mail/prayer/patches/patch-ak |   13 ++++
 15 files changed, 238 insertions(+), 248 deletions(-)

diffs (truncated from 779 to 300 lines):

diff -r cf77240d9fe2 -r 9539ea85edf8 mail/prayer/Makefile
--- a/mail/prayer/Makefile      Tue Jun 08 12:02:21 2010 +0000
+++ b/mail/prayer/Makefile      Tue Jun 08 12:34:38 2010 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2010/01/17 12:02:25 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.39 2010/06/08 12:34:38 adam Exp $
 
-DISTNAME=      prayer-1.0.18
-PKGREVISION=   6
+DISTNAME=      prayer-1.3.2
 CATEGORIES=    mail www
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -10,23 +8,31 @@
 HOMEPAGE=      http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=       Small, fast, web mail interface
 
-USE_TOOLS+=    gmake perl
-PRAYER_USER=   prayer
-PRAYER_GROUP=  prayer
-PKG_GROUPS=    ${PRAYER_GROUP}
-PKG_USERS=     ${PRAYER_USER}:${PRAYER_GROUP}
+BDB_ACCEPTED=          db4 db5
+USE_TOOLS+=            gmake perl
+REPLACE_PERL+=         templates/src/build_index.pl
+REPLACE_PERL+=         templates/src/build_map_index.pl
+
+PRAYER_USER=           prayer
+PRAYER_GROUP=          prayer
+PKG_GROUPS=            ${PRAYER_GROUP}
+PKG_USERS=             ${PRAYER_USER}:${PRAYER_GROUP}
 
 PKG_GROUPS_VARS+=      PRAYER_GROUP
 PKG_USERS_VARS+=       PRAYER_USER
 BUILD_DEFS+=           VARBASE
 
-MAKE_ENV+=     EGDIR=${EGDIR:Q}
-MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MAKE_ENV+=     BUILDLINK_PREFIX.db4="${BUILDLINK_PREFIX.db4}"
+MAKE_ENV+=     BASECFLAGS=${CFLAGS:Q}
+MAKE_ENV+=     BDBBASE="${BDBBASE}"
+MAKE_ENV+=     BDB_TYPE="${BDB_TYPE}"
 MAKE_ENV+=     BUILDLINK_PREFIX.imap-uw="${BUILDLINK_PREFIX.imap-uw}"
-MAKE_ENV+=     SSLCERTS=${SSLCERTS:Q}
+MAKE_ENV+=     EGDIR=${EGDIR}
+MAKE_ENV+=     KRB5BASE="${KRB5BASE}"
+MAKE_ENV+=     KRB5_TYPE=${KRB5_TYPE:Q}
+MAKE_ENV+=     PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=     PRAYER_USER=${PRAYER_USER} PRAYER_GROUP=${PRAYER_GROUP}
 MAKE_ENV+=     ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
+MAKE_ENV+=     SSLCERTS=${SSLCERTS:Q}
 
 PKG_SYSCONFSUBDIR=     prayer
 EGDIR=                 ${PREFIX}/share/examples/prayer
@@ -36,13 +42,12 @@
 CONF_FILES=    ${EGDIR}/prayer.cf ${PKG_SYSCONFDIR}/prayer.cf
 CONF_FILES+=   ${EGDIR}/prayer-accountd.cf ${PKG_SYSCONFDIR}/prayer-accountd.cf
 CONF_FILES+=   ${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html
-CONF_FILES+=   ${EGDIR}/welcome.html ${PKG_SYSCONFDIR}/welcome.html
 
 VAR_PREFIX=    ${VARBASE}/spool/prayer
 
 OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
 
-FILES_SUBST+=  OPSYS=${OPSYS:Q}
+FILES_SUBST+=  OPSYS=${OPSYS}
 FILES_SUBST+=  VAR_PREFIX=${VAR_PREFIX:Q}
 
 post-patch:
@@ -53,11 +58,10 @@
 pre-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r cf77240d9fe2 -r 9539ea85edf8 mail/prayer/PLIST
--- a/mail/prayer/PLIST Tue Jun 08 12:02:21 2010 +0000
+++ b/mail/prayer/PLIST Tue Jun 08 12:34:38 2010 +0000
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/06/08 12:34:38 adam Exp $
+man/man5/prayer.cf.5
+man/man8/prayer-session.8
+man/man8/prayer-ssl-prune.8
+man/man8/prayer.8
 sbin/prayer
+sbin/prayer-chroot
 sbin/prayer-cyclog
 sbin/prayer-db-prune
 sbin/prayer-sem-prune
@@ -8,66 +13,48 @@
 share/examples/prayer/motd.html
 share/examples/prayer/prayer-accountd.cf
 share/examples/prayer/prayer.cf
-share/examples/prayer/welcome.html
 share/examples/rc.d/prayer
-share/prayer/help/abook_add.html
-share/prayer/help/abook_list.html
-share/prayer/help/abook_lookup.html
-share/prayer/help/abook_search.html
-share/prayer/help/abook_take.html
-share/prayer/help/abook_update.html
-share/prayer/help/abook_xfer.html
-share/prayer/help/attachments.html
-share/prayer/help/block.html
-share/prayer/help/compose/large.html
-share/prayer/help/compose/normal.html
-share/prayer/help/compose/postponed.html
-share/prayer/help/compose/role_list.html
-share/prayer/help/copy.html
-share/prayer/help/dictionary.html
-share/prayer/help/display.html
-share/prayer/help/favourites.html
-share/prayer/help/filter.html
-share/prayer/help/filter_select.html
-share/prayer/help/folders.html
-share/prayer/help/fullname.html
-share/prayer/help/include.html
-share/prayer/help/list.html
-share/prayer/help/manage.html
-share/prayer/help/passwd.html
-share/prayer/help/prefs/compose1.html
-share/prayer/help/prefs/compose2.html
-share/prayer/help/prefs/display1.html
-share/prayer/help/prefs/folder.html
-share/prayer/help/prefs/general.html
-share/prayer/help/quota.html
-share/prayer/help/redirect.html
-share/prayer/help/rename.html
-share/prayer/help/reply.html
-share/prayer/help/roles_entry.html
-share/prayer/help/roles_list.html
-share/prayer/help/search.html
-share/prayer/help/sieve.html
-share/prayer/help/spam.html
-share/prayer/help/toolbar.html
-share/prayer/help/transfer.html
-share/prayer/help/upload_select.html
-share/prayer/help/vacation.html
-share/prayer/help/vaclog.html
-share/prayer/help/welcome.html
 share/prayer/icons/addressbook-inactive.gif
 share/prayer/icons/addressbook.gif
 share/prayer/icons/back.gif
+share/prayer/icons/bg-home-menu-top.gif
+share/prayer/icons/bg-nav-primary.gif
+share/prayer/icons/bg-tab-left-active.gif
+share/prayer/icons/bg-tab-left-over.gif
+share/prayer/icons/bg-tab-left.gif
+share/prayer/icons/bg-tab-right-active.gif
+share/prayer/icons/bg-tab-right-over.gif
+share/prayer/icons/bg-tab-right.gif
+share/prayer/icons/blank.gif
+share/prayer/icons/button-search.gif
+share/prayer/icons/button2-bm.png
 share/prayer/icons/compose-inactive.gif
 share/prayer/icons/compose.gif
 share/prayer/icons/cross.gif
 share/prayer/icons/dir.gif
 share/prayer/icons/display-inactive.gif
 share/prayer/icons/display.gif
+share/prayer/icons/divider-site-tools-small.gif
+share/prayer/icons/down.gif
 share/prayer/icons/folders-inactive.gif
 share/prayer/icons/folders.gif
 share/prayer/icons/help-inactive.gif
 share/prayer/icons/help.gif
+share/prayer/icons/icon-alert-normal.gif
+share/prayer/icons/icon-alert-warning.gif
+share/prayer/icons/icon-arrow-home-menu-orange.gif
+share/prayer/icons/icon-arrow-home-menu.gif
+share/prayer/icons/icon-arrow-nav-breadcrumb.gif
+share/prayer/icons/icon-arrow-nav-primary-down.gif
+share/prayer/icons/icon-arrow-nav-primary-up.gif
+share/prayer/icons/icon-arrow-nav-primary.gif
+share/prayer/icons/icon-home.gif
+share/prayer/icons/icon-quick-links.gif
+share/prayer/icons/icon-section.gif
+share/prayer/icons/identifier.gif
+share/prayer/icons/identifier800.gif
+share/prayer/icons/ifmlogo-small.gif
+share/prayer/icons/ifmlogo.gif
 share/prayer/icons/left-inactive.gif
 share/prayer/icons/left.gif
 share/prayer/icons/leftleft-inactive.gif
@@ -80,13 +67,45 @@
 share/prayer/icons/msg-answered.gif
 share/prayer/icons/msg-deleted.gif
 share/prayer/icons/msg-seen.gif
+share/prayer/icons/msg-seen.png
 share/prayer/icons/msg-unseen.gif
+share/prayer/icons/next-white.gif
+share/prayer/icons/next.gif
 share/prayer/icons/off.gif
 share/prayer/icons/on.gif
 share/prayer/icons/paperclip-small.gif
+share/prayer/icons/prev-white.gif
+share/prayer/icons/previous.gif
+share/prayer/icons/raven.gif
 share/prayer/icons/right-inactive.gif
 share/prayer/icons/right.gif
 share/prayer/icons/rightright-inactive.gif
 share/prayer/icons/rightright.gif
+share/prayer/icons/rssfeed.gif
+share/prayer/icons/sort-d.gif
+share/prayer/icons/sort-u.gif
+share/prayer/icons/srssfeed.gif
 share/prayer/icons/tick.gif
+share/prayer/icons/ucs-id-small.jpg
+share/prayer/icons/ucs-s.gif
+share/prayer/icons/ucs.gif
 share/prayer/icons/univheader.gif
+share/prayer/static/blue.css
+share/prayer/static/camstyle.css
+share/prayer/static/common.css
+share/prayer/static/content.css
+share/prayer/static/forms.css
+share/prayer/static/gray.css
+share/prayer/static/green.css
+share/prayer/static/help.css
+share/prayer/static/high.css
+share/prayer/static/ie6.css
+share/prayer/static/ie7.css
+share/prayer/static/layout.css
+share/prayer/static/links.css
+share/prayer/static/minmax.js
+share/prayer/static/print.css
+share/prayer/static/reset.css
+share/prayer/static/rssfeed.css
+share/prayer/static/typography.css
+share/prayer/static/yellow.css
diff -r cf77240d9fe2 -r 9539ea85edf8 mail/prayer/distinfo
--- a/mail/prayer/distinfo      Tue Jun 08 12:02:21 2010 +0000
+++ b/mail/prayer/distinfo      Tue Jun 08 12:34:38 2010 +0000
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.13 2007/06/15 23:28:16 wiz Exp $
+$NetBSD: distinfo,v 1.14 2010/06/08 12:34:38 adam Exp $
 
-SHA1 (prayer-1.0.18.tar.gz) = ab90f9bfac568ed93993beff745f1433d20f1dcc
-RMD160 (prayer-1.0.18.tar.gz) = bbe26134c69fd70026fd207f8ca0edcd24da7f74
-Size (prayer-1.0.18.tar.gz) = 566168 bytes
-SHA1 (patch-aa) = aa28cf4a598d9c8c3bf14dc9f0034ab16dccec06
-SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
-SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
-SHA1 (patch-ad) = a4d60d312012be24308405b3668edb4931892c06
-SHA1 (patch-ae) = 378adaf7a2153a54824b60ee50b7a8a4591188ff
-SHA1 (patch-af) = bc3b5b7181da0646995955245b2d9d4cc8032eed
-SHA1 (patch-ag) = 2899392ad6a852dad0ccfdbea2c1a6a8f7c5feb7
-SHA1 (patch-ah) = 7197f80ad71700276c79666090b62628c128ca21
-SHA1 (patch-ai) = 0b3edeea78d16c3792d540ea0a92943ed0bb7583
+SHA1 (prayer-1.3.2.tar.gz) = 935923fe8f4c8734d4f61cbe0228bb040f0f8152
+RMD160 (prayer-1.3.2.tar.gz) = 588377d2442e2288f097542055fbc998509e57e0
+Size (prayer-1.3.2.tar.gz) = 748315 bytes
+SHA1 (patch-aa) = db0b7a760e7ffb622e84ace97d81535c4ce0af36
+SHA1 (patch-ab) = a8ea39b18ced1b4037d3de244e4fba70fc92dfc8
+SHA1 (patch-ac) = aa1382214b9f6288c41c545c2f3b8dee04a13672
+SHA1 (patch-ad) = df8f543ecd6dacbed2cb046312c75146a5a9f6bb
+SHA1 (patch-ae) = b049fb2c284280ae9635d3337413fbd8e8904f35
+SHA1 (patch-af) = 3dde54cc6e93085e659adef6ef32bc1a3cd5af3f
+SHA1 (patch-ag) = e24faf585cd1288ba0e866a64737cd7202498dfa
+SHA1 (patch-ah) = 0b4018c703ecb315b71f74f05b4b73b69bac3326
+SHA1 (patch-ai) = a8c881876689b32f09ffec0318934f108849852f
+SHA1 (patch-aj) = 773c813b81c725b00cd5ecae9a276c7dc8b2c9fb
+SHA1 (patch-ak) = dbde773d205837e0ce4d0838f99c51f931b41753
diff -r cf77240d9fe2 -r 9539ea85edf8 mail/prayer/files/prayer.sh
--- a/mail/prayer/files/prayer.sh       Tue Jun 08 12:02:21 2010 +0000
+++ b/mail/prayer/files/prayer.sh       Tue Jun 08 12:34:38 2010 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: prayer.sh,v 1.1 2005/01/09 00:07:47 schmonz Exp $
+# $NetBSD: prayer.sh,v 1.2 2010/06/08 12:34:38 adam Exp $
 #
 # This shell script takes care of starting and stopping prayer,
 # a program providing web access to a mail server using IMAP
@@ -25,7 +25,7 @@
 rcvar=$name
 command="@PREFIX@/sbin/prayer"
 command_args=""
-pidfile="@VAR_PREFIX@/pid/prayer"
+pidfile="@VAR_PREFIX@/pid/prayer.pid"
 
 prayer_flags=${prayer_flags-""} 
 OPSYS=@OPSYS@
diff -r cf77240d9fe2 -r 9539ea85edf8 mail/prayer/patches/patch-aa
--- a/mail/prayer/patches/patch-aa      Tue Jun 08 12:02:21 2010 +0000
+++ b/mail/prayer/patches/patch-aa      Tue Jun 08 12:34:38 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/06/15 23:28:17 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2010/06/08 12:34:38 adam Exp $
 
---- defaults/Config.orig       2006-04-05 12:35:35.000000000 +0000