pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/prayer Update to 1.0.12. From the changelog:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e05fde8a3af0
branches:  trunk
changeset: 487092:e05fde8a3af0
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jan 09 00:07:46 2005 +0000

description:
Update to 1.0.12. From the changelog:

* Apparently "mutex" is already claimed by a system header on Solaris.

* File locking on Linux (probably other operating systems) is pretty
    dumb when lots of processes are trying to lock a single file
    for serialisation: all of the processes are woken each time
    that the file is unlocked. Most of the process will simply loop
    inside the kernel and attempt to lock again. Presumably this
    approach makes nonblocking locks and EINTR easier to do, but
    it does mean that you can get occasional load average spikes.
    Add MUTEX_SEMAPHORE to implement System V semaphore based lock,
    which does not have this problem in Linux. Warning: System V
    semaphores are a finite resource, and they are not released
    automatically. See: prayer-sem-prune.

* Quotas now reported in MBytes rather than KBytes.

* Add download links for text/html and text/plain attachments

* Fix bug with body->type TYPEMESSAGE: c-client API very poorly
    documented :(

* Strip out common HTML entity encodings that might be used in
    HREFs with text/html attachments.

* Fix mydb_db3.c to work with DB4.

* Integrate into Tony's funky packaging system for Hermes and PPSW.

* Add interface to automatic spam folder pruning utility that I
    wrote for Cyrus (controlled through special Sieve files).

* Fix uploads where mailboxes contain NUL characters (translate to
    space?)

* Assorted minor bugfixes

* Fix nasty /redirect bug that I managed to introduce by switching
    from url_encode to canon_encode to work around bug in Opera.
    Missing a url_encode: infinite loop from dumb UAs :(. Otherwise
    identical to 1.0.9.

* Few minor bug fixes, covered in CVS history.

pkgsrc changes:
* Rename the source rc.d script in the default RCD_SCRIPTS style.
* Respect ${VARBASE}.
* Avoid the DB_VERB_CHKPOINT flag with latest db4 (where it's been removed).
* Patch from jdc@ for 64-bit big-endian hosts.

XXX rc.d script doesn't stop all the prayer slaves

diffstat:

 mail/prayer/Makefile         |   12 +--
 mail/prayer/PLIST            |    4 +-
 mail/prayer/distinfo         |   19 +++---
 mail/prayer/files/prayer.rc  |  118 -------------------------------------------
 mail/prayer/files/prayer.sh  |  118 +++++++++++++++++++++++++++++++++++++++++++
 mail/prayer/patches/patch-aa |   28 +++++-----
 mail/prayer/patches/patch-ab |    7 +-
 mail/prayer/patches/patch-ac |    4 +-
 mail/prayer/patches/patch-ad |   11 ++-
 mail/prayer/patches/patch-ae |   11 ++-
 mail/prayer/patches/patch-af |   26 ++++----
 mail/prayer/patches/patch-ag |   19 ++++++
 12 files changed, 201 insertions(+), 176 deletions(-)

diffs (truncated from 563 to 300 lines):

diff -r 67200af9fcca -r e05fde8a3af0 mail/prayer/Makefile
--- a/mail/prayer/Makefile      Sat Jan 08 23:45:29 2005 +0000
+++ b/mail/prayer/Makefile      Sun Jan 09 00:07:46 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/09 00:07:46 schmonz Exp $
 #
 
-DISTNAME=      prayer-1.0.8
-PKGREVISION=   5
+DISTNAME=      prayer-1.0.12
 CATEGORIES=    mail www
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -10,8 +9,8 @@
 HOMEPAGE=      http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=       Small, fast, web mail interface
 
-USE_BUILDLINK3=        YES
-USE_PKGINSTALL=        YES
+USE_BUILDLINK3=        yes
+USE_PKGINSTALL=        yes
 USE_GNU_TOOLS+=        make
 USE_PERL5=     build
 PRAYER_USER=   prayer
@@ -29,14 +28,13 @@
 EGDIR=                 ${PREFIX}/share/examples/prayer
 
 RCD_SCRIPTS=           prayer
-RCD_SCRIPT_SRC.prayer= ${FILESDIR}/prayer.rc
 
 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=    /var/spool/prayer
+VAR_PREFIX=    ${VARBASE}/spool/prayer
 
 OWN_DIRS+=     ${EGDIR}
 OWN_DIRS_PERMS+=${VAR_PREFIX} ${PRAYER_USER} ${PRAYER_GROUP} 0750
diff -r 67200af9fcca -r e05fde8a3af0 mail/prayer/PLIST
--- a/mail/prayer/PLIST Sat Jan 08 23:45:29 2005 +0000
+++ b/mail/prayer/PLIST Sun Jan 09 00:07:46 2005 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2004/04/23 22:07:55 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/01/09 00:07:46 schmonz Exp $
 sbin/prayer
 sbin/prayer-cyclog
+sbin/prayer-sem-prune
 sbin/prayer-session
 sbin/prayer-ssl-prune
 share/examples/prayer/motd.html
@@ -41,6 +42,7 @@
 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
diff -r 67200af9fcca -r e05fde8a3af0 mail/prayer/distinfo
--- a/mail/prayer/distinfo      Sat Jan 08 23:45:29 2005 +0000
+++ b/mail/prayer/distinfo      Sun Jan 09 00:07:46 2005 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2004/02/28 23:50:59 heinz Exp $
+$NetBSD: distinfo,v 1.8 2005/01/09 00:07:46 schmonz Exp $
 
-SHA1 (prayer-1.0.8.tar.gz) = bda62959dae75515530fbc87304a721e17c903e4
-Size (prayer-1.0.8.tar.gz) = 519741 bytes
-SHA1 (patch-aa) = 309dfb2c7d4c38673117cdd6419c8100cf6d98e4
-SHA1 (patch-ab) = d188b7f475af8a81724e221196d1f321cebd9d54
-SHA1 (patch-ac) = f9550de3d8704ea293bc89c572f219e0c41aa8e8
-SHA1 (patch-ad) = e8d1cd82e62d86886acca94c840b55a8b55f7f17
-SHA1 (patch-ae) = b33cdbe6634f370a451a319dd140680949400943
-SHA1 (patch-af) = 969ecdce0496d889dfc3b8d1b7464148b4430ec9
+SHA1 (prayer-1.0.12.tar.gz) = 8ea568f9e0e1fe925102e80451b3c9432f5fed15
+Size (prayer-1.0.12.tar.gz) = 544239 bytes
+SHA1 (patch-aa) = 0161f04e22a8e67b5d5cb0990f7ac90bf4b8c93e
+SHA1 (patch-ab) = 72f6b8768303222a8798ca07e83efccdefa8fe25
+SHA1 (patch-ac) = b7df87589bdc2fd2894f2028652e01aa0c181fa1
+SHA1 (patch-ad) = bd8f517d5bede0fd3d3f4e9a108cd0cd99d7c8ab
+SHA1 (patch-ae) = a04d4206e9b671be0fdce73a5093fb18778a1052
+SHA1 (patch-af) = 730ee832fcb6464d7909ff9f048d7c57ce86aba8
+SHA1 (patch-ag) = d932eeb11171da4084eb56e097a7880e67a18561
diff -r 67200af9fcca -r e05fde8a3af0 mail/prayer/files/prayer.rc
--- a/mail/prayer/files/prayer.rc       Sat Jan 08 23:45:29 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: prayer.rc,v 1.1 2004/02/28 23:59:47 heinz Exp $
-#
-# This shell script takes care of starting and stopping prayer,
-# a program providing web access to a mail server using IMAP
-#
-
-## only for NetBSD
-# PROVIDE: prayer
-# REQUIRE: LOGIN
-# AFTER: mail
-# KEYWORD: shutdown
-##
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin
-export PATH
-
-if [ -f /etc/rc.subr ]
-then
-       . /etc/rc.subr
-fi
-
-name="prayer"
-rcvar=$name
-command="@PREFIX@/sbin/prayer"
-command_args=""
-pidfile="@VAR_PREFIX@/pid/prayer"
-
-prayer_flags=${prayer_flags-""} 
-OPSYS=@OPSYS@
-
-get_prayer_pid()   
-{
-       if [ -f ${pidfile} ];  then
-               prayer_pid=`head -1 ${pidfile}`
-               if ps -p ${prayer_pid} | fgrep ${name} >/dev/null; then
-                       :
-               else
-                       prayer_pid=
-               fi
-       else
-               prayer_pid=
-       fi
-
-}
-
-prayer_start()
-{
-       get_prayer_pid
-
-       if [ -n "${prayer_pid}" ]; then
-               echo "${command} already running as pid ${prayer_pid}."
-               return 1
-       fi
-       echo "Starting ${name}"
-       ${command} ${prayer_flags} ${command_args}
-}
-
-prayer_stop()
-{
-       get_prayer_pid
-
-       if [ -z "${prayer_pid}" ]; then
-               echo "${command} not running? (check ${pidfile})."
-               return 1
-       fi
-       echo "Stopping ${name}"
-       kill -HUP ${prayer_pid}
-       prayer_session_pid=`cat @VAR_PREFIX@/pid/prayer-session`
-       if [ -n "${prayer_session_pid}" ]; then
-         if ps -p ${prayer_session_pid} | fgrep ${name} >/dev/null; then
-               kill -HUP ${prayer_session_pid}
-         fi
-       fi
-
-       slaves=`ps -U prayer| cut -d' ' -f1`; kill -HUP $slaves
-
-}
-prayer_status()
-{
-       get_prayer_pid
-
-       if [ -z "${prayer_pid}" ]; then
-               echo "${command} is not running? (check ${pidfile})."
-       else
-               echo "${command} is running as pid ${prayer_pid}."
-       fi
-}
-
-if [ "${OPSYS}" = "NetBSD" ]; then
-
-       stop_cmd=prayer_stop
-
-       load_rc_config $name
-       run_rc_command "$1"
-
-else # not NetBSD
-       case ${1+"$@"} in
-       start)
-               prayer_start
-               ;;
-       stop)
-               prayer_stop
-               ;;
-       restart)
-               prayer_stop
-               sleep 2
-               prayer_start
-               ;;
-       status)
-               prayer_status
-               ;;
-       *)
-               echo "Usage: ${0} (start|stop|restart|status)"
-               ;;
-       esac
-fi
diff -r 67200af9fcca -r e05fde8a3af0 mail/prayer/files/prayer.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/prayer/files/prayer.sh       Sun Jan 09 00:07:46 2005 +0000
@@ -0,0 +1,118 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: prayer.sh,v 1.1 2005/01/09 00:07:47 schmonz Exp $
+#
+# This shell script takes care of starting and stopping prayer,
+# a program providing web access to a mail server using IMAP
+#
+
+## only for NetBSD
+# PROVIDE: prayer
+# REQUIRE: LOGIN
+# AFTER: mail
+# KEYWORD: shutdown
+##
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin
+export PATH
+
+if [ -f /etc/rc.subr ]
+then
+       . /etc/rc.subr
+fi
+
+name="prayer"
+rcvar=$name
+command="@PREFIX@/sbin/prayer"
+command_args=""
+pidfile="@VAR_PREFIX@/pid/prayer"
+
+prayer_flags=${prayer_flags-""} 
+OPSYS=@OPSYS@
+
+get_prayer_pid()   
+{
+       if [ -f ${pidfile} ];  then
+               prayer_pid=`head -1 ${pidfile}`
+               if ps -p ${prayer_pid} | fgrep ${name} >/dev/null; then
+                       :
+               else
+                       prayer_pid=
+               fi
+       else
+               prayer_pid=
+       fi
+
+}
+
+prayer_start()
+{
+       get_prayer_pid
+
+       if [ -n "${prayer_pid}" ]; then
+               echo "${command} already running as pid ${prayer_pid}."
+               return 1
+       fi
+       echo "Starting ${name}."
+       ${command} ${prayer_flags} ${command_args}
+}
+
+prayer_stop()
+{
+       get_prayer_pid
+
+       if [ -z "${prayer_pid}" ]; then
+               echo "${command} not running? (check ${pidfile})."
+               return 1
+       fi
+       echo "Stopping ${name}."
+       kill -HUP ${prayer_pid}
+       prayer_session_pid=`cat @VAR_PREFIX@/pid/prayer-session`
+       if [ -n "${prayer_session_pid}" ]; then
+         if ps -p ${prayer_session_pid} | fgrep ${name} >/dev/null; then
+               kill -HUP ${prayer_session_pid}
+         fi
+       fi
+
+       slaves=`ps -U prayer| cut -d' ' -f1`; kill -HUP $slaves
+
+}
+prayer_status()
+{
+       get_prayer_pid
+
+       if [ -z "${prayer_pid}" ]; then
+               echo "${command} is not running? (check ${pidfile})."
+       else
+               echo "${command} is running as pid ${prayer_pid}."
+       fi
+}



Home | Main Index | Thread Index | Old Index