diff options
author | jlam <jlam@pkgsrc.org> | 2005-08-11 00:03:51 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-08-11 00:03:51 +0000 |
commit | 2c991eed142b00fdabb98880aadd8f1abcd45303 (patch) | |
tree | 96c1b115c2283398b86e27c575d739c61c0b97ff /mail/sqwebmail | |
parent | 75012873439b485028571208a7e916e7660e1b56 (diff) | |
download | pkgsrc-2c991eed142b00fdabb98880aadd8f1abcd45303.tar.gz |
Update mail/sqwebmail to 5.0.4. Changes from version 5.0.1 include:
* sqwebmail: Implemented account groups, administrator group.
* sqwebmaild.dist.in (LOGGEROPTS): Added LOGGEROPTS setting.
* gpglib/gpg.c: gnupg returns non-zero exit even if succesfully
unencrypted, when just the signature is bad.
* sv-make_timezonelist.pl: Added /usr/share/lib/zoneinfo to the
search list.
Diffstat (limited to 'mail/sqwebmail')
-rw-r--r-- | mail/sqwebmail/Makefile | 15 | ||||
-rw-r--r-- | mail/sqwebmail/distinfo | 19 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-aa | 10 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-ad | 14 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-af | 20 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-ah | 6 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-ai | 8 | ||||
-rw-r--r-- | mail/sqwebmail/patches/patch-aj | 6 |
8 files changed, 35 insertions, 63 deletions
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 9757d36a95a..606f4f58c45 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:13 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/08/11 00:03:51 jlam Exp $ -DISTNAME= sqwebmail-5.0.1 +DISTNAME= sqwebmail-5.0.4 PKGBASE= ${DISTNAME:C/-[^-]*$//} CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} @@ -10,8 +10,8 @@ MAINTAINER= jlam@NetBSD.org COMMENT= webmail CGI for access to maildir-style mailboxes HOMEPAGE= http://www.courier-mta.org/sqwebmail/ -DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir -DEPENDS+= maildrop>=1.8.0:../../mail/maildrop +DEPENDS+= courier-maildir>=0.51.0:../../mail/courier-maildir +DEPENDS+= maildrop>=1.8.1:../../mail/maildrop USE_TOOLS+= env gmake perl:run USE_LANGUAGES= c c++ @@ -89,13 +89,6 @@ SPECIAL_PERMS= libexec/courier/sqwebpasswd \ ${COURIER_USER} ${COURIER_GROUP} 2755 RCD_SCRIPTS= sqwebmail -SUBST_CLASSES+= courier -SUBST_MESSAGE.courier= "Substituting for @mailuser@ and @mailgroup@." -SUBST_FILES.courier= sqwebmail/Makefile.in -SUBST_SED.courier= -e "s|@mailuser@|${COURIER_USER}|g" \ - -e "s|@mailgroup@|${COURIER_GROUP}|g" -SUBST_STAGE.courier= pre-configure - INSTALLATION_DIRS= bin man/man1 sbin .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index abaadf01829..273c0ee2fc1 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.7 2005/03/23 04:55:36 jlam Exp $ +$NetBSD: distinfo,v 1.8 2005/08/11 00:03:51 jlam Exp $ -SHA1 (sqwebmail-5.0.1.tar.bz2) = 4ea55db8170e9cfd81d627e4b1598a30a9ad878a -RMD160 (sqwebmail-5.0.1.tar.bz2) = d9e0c7ab12cf0283eb525c2f3095a1c774b128af -Size (sqwebmail-5.0.1.tar.bz2) = 3148774 bytes -SHA1 (patch-aa) = d4cf4148121211aa544e3e4050e8db49dc0beca8 -SHA1 (patch-ad) = 9f58af84b70854738870652538ba2a345eae3ad7 -SHA1 (patch-af) = e03ab852352149642753dbc941db19172184323d -SHA1 (patch-ah) = 44884e7287581f295980542600449f2949e0cd0e -SHA1 (patch-ai) = bb1af4017e302a2eb600146a46ae62319e29bb4d -SHA1 (patch-aj) = e9773b1067e977507174dfae0b628c85b4d15916 +SHA1 (sqwebmail-5.0.4.tar.bz2) = a796d3a72df2acdf5e37ba41db79d376ee4c5f29 +RMD160 (sqwebmail-5.0.4.tar.bz2) = 83377afd274f008cae7fb133577d6b2c6ec62ce5 +Size (sqwebmail-5.0.4.tar.bz2) = 3567522 bytes +SHA1 (patch-aa) = 88cc780caf78aa86a17962a7ca93709c8254bf8c +SHA1 (patch-ad) = 5207b327b2e88bc75a820fcd7467a8ddf207bfb3 +SHA1 (patch-ah) = 8624f6bc7453ee2544a18e0bd1d7d2e0044c083f +SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2 +SHA1 (patch-aj) = d2164d3fad61f63062f88e489f4be7f1ff6bdea2 diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa index 95fe5350a50..70a099abb4e 100644 --- a/mail/sqwebmail/patches/patch-aa +++ b/mail/sqwebmail/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.5 2005/03/23 04:55:36 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2005/08/11 00:03:51 jlam Exp $ ---- Makefile.in.orig 2004-12-09 21:54:15.000000000 -0500 +--- Makefile.in.orig 2005-07-23 10:00:11.000000000 -0400 +++ Makefile.in -@@ -219,19 +219,18 @@ DIST_SUBDIRS = numlib gdbmobj bdbobj md5 - noinst_SCRIPTS = sqwebmail.spec - EXTRA_DIST = INSTALL.html INSTALL.vchkpw README NEWS README.html README.pam sysconftool automake.fix COPYING.GPL README.logindomainlist.html +@@ -236,19 +236,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE + pgpkeys.txt + scriptbindir = $(sbindir) -scriptbin_SCRIPTS = \ - sharedindexinstall sharedindexsplit diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad index 8a1135effe0..e63b36b1b02 100644 --- a/mail/sqwebmail/patches/patch-ad +++ b/mail/sqwebmail/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2005/08/11 00:03:51 jlam Exp $ ---- sqwebmail/Makefile.in.orig 2004-12-09 21:54:55.000000000 -0500 +--- sqwebmail/Makefile.in.orig 2005-07-23 10:00:36.000000000 -0400 +++ sqwebmail/Makefile.in -@@ -287,7 +287,7 @@ CLEANFILES = htmllibdir.h ldapsearch web +@@ -284,7 +284,7 @@ CLEANFILES = htmllibdir.h ldapsearch web DISTCLEANFILES = webmail.authpam SUBDIRS = images html @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $ sysconf_DATA = ldapaddressbook.dist sqwebmaild.dist DOCS = SECURITY BUGS TODO SECURITY.html BUGS.html TODO.html noinst_DATA = $(DOCS) TIMEZONELIST -@@ -960,7 +960,7 @@ install-perms-local: install-perms-cache +@@ -979,7 +979,7 @@ install-perms-local: install-perms-cache htmllibdir.h: config.status echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $ echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h -@@ -968,7 +968,7 @@ htmllibdir.h: config.status +@@ -987,7 +987,7 @@ htmllibdir.h: config.status echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $ ; then \ echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \ ; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \ -@@ -977,7 +977,7 @@ htmllibdir.h: config.status +@@ -996,7 +996,7 @@ htmllibdir.h: config.status ; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \ ; fi echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h @@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $ echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h ldapsearch: ../ldapaddressbook/ldapsearch -@@ -1005,9 +1005,6 @@ install-perms-cache: +@@ -1024,9 +1024,6 @@ install-perms-cache: @echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat cache-reminder: diff --git a/mail/sqwebmail/patches/patch-af b/mail/sqwebmail/patches/patch-af deleted file mode 100644 index 9b355f48e93..00000000000 --- a/mail/sqwebmail/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.1 2005/02/18 22:12:56 jlam Exp $ - ---- pcp/Makefile.in.orig 2004-12-09 21:54:49.000000000 -0500 -+++ pcp/Makefile.in -@@ -802,15 +802,6 @@ sysconfdir.h: config.status - echo '#define SYSCONFDIR "$(sysconfdir)"' >sysconfdir.h - - install-exec-local: -- $(mkinstalldirs) $(DESTDIR)$(calendardir)/public -- $(mkinstalldirs) $(DESTDIR)$(calendardir)/private -- $(mkinstalldirs) $(DESTDIR)$(localpcpdcachedir) -- chmod 755 $(DESTDIR)$(calendardir) -- chmod 755 $(DESTDIR)$(calendardir)/public -- chmod 750 $(DESTDIR)$(calendardir)/private -- chmod 700 $(DESTDIR)$(localpcpdcachedir) -- -chown @localcacheowner@ $(DESTDIR)$(localpcpdcachedir) -- -chgrp -R @mailgroup@ $(DESTDIR)$(calendardir) - echo "localcacheowner=@localcacheowner@" >uids - echo "calendardir=$(calendardir)" >>uids - echo "mailgroup=@mailgroup@" >>uids diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah index 06346e24d55..3bc00e3e051 100644 --- a/mail/sqwebmail/patches/patch-ah +++ b/mail/sqwebmail/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2005/02/18 22:12:56 jlam Exp $ +$NetBSD: patch-ah,v 1.2 2005/08/11 00:03:51 jlam Exp $ ---- sqwebmail/configure.orig 2004-11-29 22:53:57.000000000 -0500 +--- sqwebmail/configure.orig 2005-07-23 10:00:37.000000000 -0400 +++ sqwebmail/configure -@@ -19757,7 +19757,7 @@ fi; +@@ -19780,7 +19780,7 @@ fi; diff --git a/mail/sqwebmail/patches/patch-ai b/mail/sqwebmail/patches/patch-ai index 7f7f8dae32a..121bf9ad31d 100644 --- a/mail/sqwebmail/patches/patch-ai +++ b/mail/sqwebmail/patches/patch-ai @@ -1,11 +1,11 @@ -$NetBSD: patch-ai,v 1.2 2005/03/23 04:55:36 jlam Exp $ +$NetBSD: patch-ai,v 1.3 2005/08/11 00:03:51 jlam Exp $ ---- sqwebmaild.rc.in.orig 2005-02-19 23:59:10.000000000 -0500 +--- sqwebmaild.rc.in.orig 2005-07-05 08:37:46.000000000 -0400 +++ sqwebmaild.rc.in @@ -28,7 +28,7 @@ startpcp() { libexecdir=${libexecdir} ; . @sysconfdir@/sqwebmaild ; \ - @courierlogger@ -pid=${PIDFILE}.pcp -start \ + @courierlogger@ -pid=${PIDFILE}.pcp $LOGGEROPTS -start \ - ${libexecdir}/sqwebmail/pcpd server" + ${libexecdir}/courier/pcpd server" ;; @@ -14,7 +14,7 @@ $NetBSD: patch-ai,v 1.2 2005/03/23 04:55:36 jlam Exp $ @@ -46,7 +46,7 @@ start) libexecdir=${libexecdir} ; . @sysconfdir@/sqwebmaild ; \ - @courierlogger@ -pid=${PIDFILE} -start \ + @courierlogger@ -pid=${PIDFILE} $LOGGEROPTS -start \ - ${libexecdir}/sqwebmail/sqwebmaild" + ${libexecdir}/courier/sqwebmaild" ;; diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj index 97526e57197..8a628a0e687 100644 --- a/mail/sqwebmail/patches/patch-aj +++ b/mail/sqwebmail/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2005/02/18 22:12:56 jlam Exp $ +$NetBSD: patch-aj,v 1.2 2005/08/11 00:03:51 jlam Exp $ ---- INSTALL.html.orig 2004-11-09 20:01:39.000000000 -0500 +--- INSTALL.html.orig 2005-04-03 12:15:07.000000000 -0400 +++ INSTALL.html -@@ -681,7 +681,7 @@ is not Qmail, and it implements DSNs.</p +@@ -685,7 +685,7 @@ Qmail, and it implements DSNs.</p> installation. The following presumes that SqWebMail's configuration files are installed in <code>/usr/lib/sqwebmail</code> (the default).</p> |