summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/sqwebmail/DEINSTALL38
-rw-r--r--mail/sqwebmail/DESCR6
-rw-r--r--mail/sqwebmail/MESSAGE6
-rw-r--r--mail/sqwebmail/Makefile123
-rw-r--r--mail/sqwebmail/PLIST19
-rw-r--r--mail/sqwebmail/distinfo18
-rw-r--r--mail/sqwebmail/files/sqwebmail.sh19
-rw-r--r--mail/sqwebmail/patches/patch-aa94
-rw-r--r--mail/sqwebmail/patches/patch-ab13
-rw-r--r--mail/sqwebmail/patches/patch-ad44
-rw-r--r--mail/sqwebmail/patches/patch-af20
-rw-r--r--mail/sqwebmail/patches/patch-ag13
-rw-r--r--mail/sqwebmail/patches/patch-ah13
-rw-r--r--mail/sqwebmail/patches/patch-ai38
-rw-r--r--mail/sqwebmail/patches/patch-aj13
15 files changed, 280 insertions, 197 deletions
diff --git a/mail/sqwebmail/DEINSTALL b/mail/sqwebmail/DEINSTALL
index 276deeaa898..d01d9aa1e25 100644
--- a/mail/sqwebmail/DEINSTALL
+++ b/mail/sqwebmail/DEINSTALL
@@ -1,17 +1,29 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/07/14 20:07:22 jlam Exp $
-
-# Additional files that are may be created for sqwebmail.
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/authcharset"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/defaultdomain"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/hostname"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/logindomainlist"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/maildirfilterconfig"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/nochangingfrom"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/noimages"
-ALL_FILES="${ALL_FILES} /dev/null ${PKG_SYSCONFDIR}/usexsender"
+# $NetBSD: DEINSTALL,v 1.4 2005/02/18 22:12:56 jlam Exp $
case ${STAGE} in
DEINSTALL)
- # Unconditionally remove the SqWebMail socket.
- ${RM} -f @SQWEBMAIL_STATEDIR@/sqwebmail.sock
+ #
+ # Note some additional files that may be created by the sysadmin
+ # that can probably be removed.
+ #
+ if ${TEST} -x ./+FILES; then
+ for file in \
+ ${PKG_SYSCONFDIR}/authcharset \
+ ${PKG_SYSCONFDIR}/autoresponsesquota \
+ ${PKG_SYSCONFDIR}/defaultdomain \
+ ${PKG_SYSCONFDIR}/logindomainlist \
+ ${PKG_SYSCONFDIR}/maildirfilterconfig
+ do
+ ${ECHO} "# FILE: $file . /dev/null" >> ./+FILES
+ done
+ fi
+
+ sockfile="@SQWEBMAIL_STATEDIR@/sqwebmail.sock"
+ if ${TEST} -f "$sockfile"; then
+ # Unconditionally remove the SqWebMail socket.
+ ${ECHO} "Removing sqwebmail socket file:"
+ ${ECHO} " $sockfile"
+ ${RM} -f $sockfile
+ fi
+ ;;
esac
diff --git a/mail/sqwebmail/DESCR b/mail/sqwebmail/DESCR
index a5a9ed1c920..7722974c92a 100644
--- a/mail/sqwebmail/DESCR
+++ b/mail/sqwebmail/DESCR
@@ -1,3 +1,7 @@
SqWebMail is a web CGI client for sending and receiving E-mail using
maildir mailboxes. It is very lightweight -- it reads mail directly
-from maildirs.
+from maildirs. It also contains a web-based calendar application.
+
+This package differs from a vanilla SqWebMail installation in that
+the files are installed at locations that more closely correspond to
+a Courier installation.
diff --git a/mail/sqwebmail/MESSAGE b/mail/sqwebmail/MESSAGE
index 2c799053249..c9f710ee1df 100644
--- a/mail/sqwebmail/MESSAGE
+++ b/mail/sqwebmail/MESSAGE
@@ -1,11 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/02/23 23:41:43 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2005/02/18 22:12:56 jlam Exp $
You must create a cron job that runs at regular intervals (one hour is
fine) that executes the following Perl script to clean the SqWebMail
user cache:
- ${PREFIX}/share/courier/sqwebmail/cleancache.pl
+ ${PKG_SYSCONFDIR}/cleancache.pl
You will need to make SqWebMail accessible through your HTTP server by
making URLs with path "${IMAGEURL}/" resolve to the images in
@@ -36,6 +36,6 @@ If you're using a non-default sendmail program, you will need to edit:
To use GPG with SqWebMail, you will need to install the security/gnupg
package and you should read the documentation at:
- ${PREFIX}/share/doc/html/courier/sqwebmail/README.gpg.html
+ ${PREFIX}/share/doc/courier/sqwebmail/README.gpg.html
===========================================================================
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index a81673162b7..29108718bfe 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,116 +1,125 @@
-# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.27 2005/02/18 22:12:56 jlam Exp $
-DISTNAME= sqwebmail-4.0.5
-PKGREVISION= 2
-CATEGORIES= www
-COMMENT= webmail CGI for access to local maildir-style mailboxes
-HOMEPAGE= http://www.inter7.com/sqwebmail/
+DISTNAME= sqwebmail-5.0.0
+PKGBASE= ${DISTNAME:C/-[^-]*$//}
+CATEGORIES= mail www
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
+EXTRACT_SUFX= .tar.bz2
-DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
-DEPENDS+= courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
+MAINTAINER= jlam@NetBSD.org
+COMMENT= webmail CGI for access to maildir-style mailboxes
+HOMEPAGE= http://www.courier-mta.org/sqwebmail/
-USE_BUILDLINK3= yes
+DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
+DEPENDS+= maildrop>=1.8.0:../../mail/maildrop
+
+USE_GNU_TOOLS+= make
USE_LANGUAGES= c c++
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
USE_PERL5= yes
-USE_PKGINSTALL= yes
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-INSTALL_EXTRA_TMPL+= ${.CURDIR}/../courier-auth/INSTALL
-
-.include "../courier-auth/Makefile.common"
+.include "../../mail/courier-maildir/Makefile.common"
+.include "../../security/courier-authlib/Makefile.common"
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
SQWEBMAIL_STATEDIR= ${VARBASE}/sqwebmail
-SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/cache
+SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/logincache
SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
-SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html
-SQWEBMAIL_IMAGEDIR= ${DATADIR}/sqwebmail/images
+SQWEBMAIL_IMAGEDIR= ${PREFIX}/share/courier/sqwebmail/images
SQWEBMAIL_IMAGEURL?= /sqwebmail
BUILD_DEFS+= SQWEBMAIL_IMAGEURL
FILES_SUBST+= SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
+MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
+MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
SENDMAIL?= /usr/sbin/sendmail
+MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
# This is used by the sqwebmail configure script to set the location of
-# the sqwebmaild socket file, lockfile and pidfile.
+# the sqwebmaild socket file and lockfile.
#
CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR}
-CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR}
-CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR}
-CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER}
-CONFIGURE_ARGS+= --with-mailer=${SENDMAIL}
-CONFIGURE_ARGS+= --enable-https=auto
+CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier
+CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//'
+
CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
-CONFIGURE_ARGS+= --with-htmldir=${SQWEBMAIL_HTMLDIR}
+CONFIGURE_ARGS+= --enable-https=auto
CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR}
CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL}
-
-MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}"
+CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR}
+CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER}
+CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR}
CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell"
+CONFIGURE_ARGS+= --with-mailer=${SENDMAIL}
+CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP}
+CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run
+
CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg"
CONFIGURE_ENV+= ldapsearch="${LOCALBASE}/bin/ldapsearch"
-MAIL_GROUP?= mail
-PKG_GROUPS= ${MAIL_GROUP}
-
+MAKE_DIRS= ${VARBASE}/run
OWN_DIRS= ${SQWEBMAIL_STATEDIR}
-OWN_DIRS_PERMS= ${SQWEBMAIL_CACHEDIR} ${ROOT_USER} ${ROOT_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR} ${ROOT_USER} ${MAIL_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/public ${ROOT_USER} ${MAIL_GROUP} 0755
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private ${ROOT_USER} ${MAIL_GROUP} 0750
-OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache ${ROOT_USER} ${MAIL_GROUP} 0700
-
-GEN_FILES= ldapaddressbook
-GEN_FILES+= sqwebmaild
+OWN_DIRS+= ${SQWEBMAIL_CACHEDIR}
+OWN_DIRS_PERMS= ${SQWEBMAIL_CALENDARDIR} \
+ ${ROOT_USER} ${COURIER_GROUP} 0755
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/public \
+ ${ROOT_USER} ${COURIER_GROUP} 0755
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/private \
+ ${ROOT_USER} ${COURIER_GROUP} 0750
+OWN_DIRS_PERMS+= ${SQWEBMAIL_CALENDARDIR}/localcache \
+ ${ROOT_USER} ${COURIER_GROUP} 0700
+
+GEN_FILES= ldapaddressbook sqwebmaild
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
-MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
-MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
-SUPPORT_FILES= ${EGDIR}/calendarmode ${PKG_SYSCONFDIR}/calendarmode
-SUPPORT_FILES+= /dev/null ${PKG_SYSCONFDIR}/nodsn
.for FILE in ${GEN_FILES}
CONF_FILES+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE}
.endfor
+CONF_FILES+= ${EGDIR}/calendarmode ${PKG_SYSCONFDIR}/calendarmode
CONF_FILES_PERMS= # empty
-.for FILE in ldapsearch sendit.sh
-CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \
+.for FILE in cleancache.pl ldapsearch sendit.sh
+CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${FILE} \
${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
+SPECIAL_PERMS= libexec/courier/sqwebpasswd \
+ ${COURIER_USER} ${COURIER_GROUP} 2755
RCD_SCRIPTS= sqwebmail
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
+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
-pre-configure:
- for file in ${WRKSRC}/sqwebmail/Makefile.in; do \
- ${MV} -f $$file $$file.bak; \
- ${SED} -e "s|@htmldir@|${SQWEBMAIL_HTMLDIR}|g" \
- -e "s|@scriptdir@|@datadir@/sqwebmail|g" \
- $$file.bak > $$file; \
- done
+INSTALLATION_DIRS= bin man/man1 sbin
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../security/courier-authlib/buildlink3.mk"
# Default to non-groupware calendar-mode.
post-build:
${ECHO} "local" > ${WRKDIR}/calendarmode
post-install:
- ${LN} -sf ${DATADIR}/sqwebmail/webgpg ${PREFIX}/sbin/webgpg
+ ${INSTALL_SCRIPT} ${WRKSRC}/gpglib/webgpg ${PREFIX}/sbin
+ ${INSTALL_PROGRAM} ${WRKSRC}/gpglib/mimegpg ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/gpglib/mimegpg.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/sqwebmail/sqwebmail.pamconf \
+ ${EGDIR}/webmail.pam
${INSTALL_DATA_DIR} ${DOCDIR}/sqwebmail
- ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/README.logindomainlist.html \
${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
${DOCDIR}/sqwebmail/README.gpg.html
- ${INSTALL_DATA} ${WRKSRC}/maildir/README.maildirfilter.html \
- ${DOCDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
${DOCDIR}/sqwebmail/README.pcp.html
${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${DOCDIR}/sqwebmail
diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST
index 23c71a79f03..6c394334c01 100644
--- a/mail/sqwebmail/PLIST
+++ b/mail/sqwebmail/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/14 20:07:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/18 22:12:56 jlam Exp $
+bin/mimegpg
libexec/cgi-bin/sqwebmail
-libexec/courier/sqwebmail/makemime
-libexec/courier/sqwebmail/pcpd
-libexec/courier/sqwebmail/reformime
-libexec/courier/sqwebmail/sqwebmaild
-libexec/courier/sqwebmaild.rc
+libexec/courier/pcpd
+libexec/courier/sqwebmaild
+libexec/courier/sqwebpasswd
+man/man1/mimegpg.1
+sbin/sqwebmaild
sbin/webgpg
share/courier/sqwebmail/cleancache.pl
share/courier/sqwebmail/html/en
@@ -104,19 +105,16 @@ share/courier/sqwebmail/images/trash2.png
share/courier/sqwebmail/images/uncancel.png
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
-share/courier/sqwebmail/webgpg
share/doc/courier/sqwebmail/BUGS.html
-share/doc/courier/sqwebmail/COPYING
share/doc/courier/sqwebmail/INSTALL.html
share/doc/courier/sqwebmail/README.gpg.html
share/doc/courier/sqwebmail/README.logindomainlist.html
-share/doc/courier/sqwebmail/README.maildirfilter.html
share/doc/courier/sqwebmail/README.pcp.html
share/doc/courier/sqwebmail/SECURITY.html
share/examples/courier/calendarmode
share/examples/courier/ldapaddressbook.dist
share/examples/courier/sqwebmaild.dist
-share/examples/courier/webmail.authpam
+share/examples/courier/webmail.pam
@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
@dirrm share/doc/courier/sqwebmail
@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE}
@@ -125,5 +123,4 @@ share/examples/courier/webmail.authpam
@dirrm share/courier/sqwebmail/html
@dirrm share/courier/sqwebmail
@unexec ${RMDIR} -p %D/share/courier 2>/dev/null || ${TRUE}
-@dirrm libexec/courier/sqwebmail
@unexec ${RMDIR} -p %D/libexec/courier 2>/dev/null || ${TRUE}
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index f23bb938903..cf37332637a 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.4 2004/07/14 20:07:22 jlam Exp $
+$NetBSD: distinfo,v 1.5 2005/02/18 22:12:56 jlam Exp $
-SHA1 (sqwebmail-4.0.5.tar.bz2) = 46f9d56f7a4c41287ac487c057f42a678e41bdb4
-Size (sqwebmail-4.0.5.tar.bz2) = 1955841 bytes
-SHA1 (patch-aa) = 9bb3045b2048b40b37140d16fbd094f5c0c85087
-SHA1 (patch-ab) = d0325fa73df491819a590c6a18613a548a4ecd65
-SHA1 (patch-ad) = 9c43d45a1c00816827a7d2c543232bdefe73fe9b
-SHA1 (patch-ae) = 9962adec77332508c76e0c7a6ad5c0c0f33581e8
-SHA1 (patch-af) = 2d3aed6804f135ce3ca64c77aed90a9e6076907a
+SHA1 (sqwebmail-5.0.0.tar.bz2) = 1ed79941b05f8072ebac928e93e6cdb7004f3e00
+Size (sqwebmail-5.0.0.tar.bz2) = 3146311 bytes
+SHA1 (patch-aa) = 80feddb9bf74b964bbb485cbfa4e4a3a01733176
+SHA1 (patch-ad) = 9f58af84b70854738870652538ba2a345eae3ad7
+SHA1 (patch-af) = e03ab852352149642753dbc941db19172184323d
+SHA1 (patch-ag) = c7575c56feb6ca5266d0627ca47c204ba04ad6d1
+SHA1 (patch-ah) = 44884e7287581f295980542600449f2949e0cd0e
+SHA1 (patch-ai) = 7f07097a7979ea34c71b3c47418db573cec9018e
+SHA1 (patch-aj) = e9773b1067e977507174dfae0b628c85b4d15916
diff --git a/mail/sqwebmail/files/sqwebmail.sh b/mail/sqwebmail/files/sqwebmail.sh
index 87429ccdb7c..d033b837066 100644
--- a/mail/sqwebmail/files/sqwebmail.sh
+++ b/mail/sqwebmail/files/sqwebmail.sh
@@ -1,21 +1,19 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: sqwebmail.sh,v 1.2 2004/07/14 20:07:22 jlam Exp $
+# $NetBSD: sqwebmail.sh,v 1.3 2005/02/18 22:12:56 jlam Exp $
#
# Courier SqWebMail services daemon
#
# PROVIDE: sqwebmail
# REQUIRE: authdaemond
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
+. /etc/rc.subr
name="sqwebmail"
rcvar=${name}
command="@PREFIX@/sbin/courierlogger"
-ctl_command="@PREFIX@/libexec/courier/sqwebmaild.rc"
-pidfile="/var/run/sqwebmaild.pid"
+ctl_command="@PREFIX@/sbin/sqwebmaild"
+pidfile="@VARBASE@/run/sqwebmaild.pid"
required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
required_vars="authdaemond"
@@ -58,10 +56,5 @@ courier_doit()
${ctl_command} ${action}
}
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${start_cmd}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index 5c473980b36..6b7e1c8eff3 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,84 +1,38 @@
-$NetBSD: patch-aa,v 1.3 2004/07/14 20:07:22 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/18 22:12:56 jlam Exp $
---- Makefile.in.orig Tue Jul 13 13:41:32 2004
-+++ Makefile.in Tue Jul 13 13:45:36 2004
-@@ -156,17 +156,15 @@
- @HAS_USERDB_FALSE@userdb_data =
-
+--- Makefile.in.orig 2004-12-09 21:54:15.000000000 -0500
++++ 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
scriptbindir = $(sbindir)
--scriptbin_SCRIPTS = $(userdb_scripts) \
+-scriptbin_SCRIPTS = \
- sharedindexinstall sharedindexsplit
--
-+scriptbin_SCRIPTS =
-
--pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd authenumerate
-+pkglibPROGRAMS = reformime makemime pcpd
-
- pkglibexecdir = $(libexecdir)/sqwebmail
- pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
- libexec_SCRIPTS = sqwebmaild.rc
-
--pkgsbinPROGRAMS = courierlogger
-+pkgsbinPROGRAMS =
- pkgsbindir = $(sbindir)
- pkgsbin_PROGRAMS = @pkgsbinPROGRAMS_exec@
-
-@@ -177,10 +175,10 @@
++scriptbin_SCRIPTS = sqwebmaild.rc
+-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
+-pkglibexecdir = $(libexecdir)/sqwebmail
+-libexec_SCRIPTS = sqwebmaild.rc
++pkglibPROGRAMS = pcpd
++pkglibexecdir = $(libexecdir)/courier
++libexec_SCRIPTS =
+ CLEANFILES = $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) \
+ sharedindexinstall sharedindexsplit
pkgman8dir = @mandir@/man8
--pkgman8_DATA = deliverquota.8 $(userdb_data)
-+pkgman8_DATA =
-
+-pkgman8_DATA = deliverquota.8
++pkgman8_DATA =
pkgman1dir = @mandir@/man1
-pkgman1_DATA = maildirmake.1
-+pkgman1_DATA =
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -826,42 +824,20 @@
- # Install SqWebMail setuid to root, if we're running as root
- #
-
--install-exec-local: install-userdb-script
-+install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(cgibindir)
- test -w $(DESTDIR)$(cgibindir) || exit 0; \
- $(INSTALL_PROGRAM) sqwebmail/sqwebmail \
- $(DESTDIR)$(cgibindir)/sqwebmail
- $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
- $(INSTALL_PROGRAM) sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild
-- $(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib
-- for f in `cat authlib/installlist` dummy ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f ; done
-- for f in `cat authlib/installlist.sh` dummy ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_SCRIPT) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f ; done
-- . authlib/authpwdprogs ; for f in `echo $$PWPROGS dummy` ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_PROGRAM) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f \
-- && chmod u+s $(DESTDIR)$(libexecdir)/authlib/$$f; done
-- . authlib/authpwdprogs ; for f in `echo $$PWSCRIPTS dummy` ; do \
-- test "$$f" = "dummy" && continue ; \
-- $(INSTALL_SCRIPT) authlib/$$f \
-- $(DESTDIR)$(libexecdir)/authlib/$$f ; done
--
--install-data-local: install-userdb-local
-- . authlib/authdaemonrc ; test "$$authdaemonvar" != "" || exit 0 ; \
-- $(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || exit 1 ; \
-- chmod 700 $(DESTDIR)@authdaemonvar@
-+
-+install-data-local:
- $(mkinstalldirs) $(DESTDIR)@imagedir@
- for f in `cat sqwebmail/images/filelist` ; do \
++pkgman1_DATA =
+ @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/main.html
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -829,7 +828,6 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/sqwebmail/images/$$f $(DESTDIR)@imagedir@/$$f ;\
done
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- cp /dev/null $(DESTDIR)$(sysconfdir)/nodsn
@cat sqwebmail/sqwebmail.msg
- uninstall-local: uninstall-userdb-local uninstall-userdb-script
+ uninstall-local:
diff --git a/mail/sqwebmail/patches/patch-ab b/mail/sqwebmail/patches/patch-ab
deleted file mode 100644
index bdf71c005d5..00000000000
--- a/mail/sqwebmail/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/07/14 20:07:22 jlam Exp $
-
---- authlib/Makefile.in.orig Tue Jul 13 13:46:52 2004
-+++ authlib/Makefile.in Tue Jul 13 13:47:14 2004
-@@ -1311,7 +1311,7 @@
-
- info-am:
-
--install-data-am: install-data-local
-+install-data-am:
-
- install-exec-am:
-
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index ecdbb3fb62f..8a1135effe0 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,22 +1,50 @@
-$NetBSD: patch-ad,v 1.3 2004/07/14 20:07:22 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2005/02/18 22:12:56 jlam Exp $
---- sqwebmail/Makefile.in.orig Tue Jul 13 13:47:42 2004
-+++ sqwebmail/Makefile.in Tue Jul 13 13:51:39 2004
-@@ -831,7 +831,7 @@
+--- sqwebmail/Makefile.in.orig 2004-12-09 21:54:55.000000000 -0500
++++ sqwebmail/Makefile.in
+@@ -287,7 +287,7 @@ CLEANFILES = htmllibdir.h ldapsearch web
+
+ DISTCLEANFILES = webmail.authpam
+ SUBDIRS = images html
+-script_SCRIPTS = sendit.sh cleancache.pl ldapsearch webgpg
++script_SCRIPTS = sendit.sh cleancache.pl ldapsearch
+ 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
htmllibdir.h: config.status
echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
- echo '#define SENDITSH "$(scriptdir)/sendit.sh"' >>htmllibdir.h
+ echo '#define SENDITSH "$(sysconfdir)/sendit.sh"' >>htmllibdir.h
- echo '#define NOCHANGINGFROM "$(sysconfdir)/nochangingfrom"' >>htmllibdir.h
- echo '#define USEXSENDER "$(sysconfdir)/usexsender"' >>htmllibdir.h
echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
-@@ -850,7 +850,7 @@
+ echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
+ echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
+@@ -968,7 +968,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
+- if test -d $(srcdir)/../courier \
++ if true || test -d $(srcdir)/../courier \
+ ; then \
+ echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
+ ; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
+@@ -977,7 +977,7 @@ htmllibdir.h: config.status
; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \
; fi
echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h
- echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h
+ echo '#define LDAPSEARCH "$(sysconfdir)/ldapsearch"' >>htmllibdir.h
- echo '#define NOIMAGES "$(sysconfdir)/noimages"' >>htmllibdir.h
echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h
+ ldapsearch: ../ldapaddressbook/ldapsearch
+@@ -1005,9 +1005,6 @@ install-perms-cache:
+ @echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
+
+ cache-reminder:
+- -$(mkinstalldirs) $(DESTDIR)@cachedir@
+- -$(mkinstalldirs) $(DESTDIR)$(piddir)
+- test -w /etc || exit 0; chown @cacheowner@ $(DESTDIR)@cachedir@
+ @rm -f cron.cmd
+ @echo '#! @SHELL@' >cron.cmd
+ @echo 'su -p -c "$(scriptdir)/cleancache.pl" @cacheowner@' >>cron.cmd
diff --git a/mail/sqwebmail/patches/patch-af b/mail/sqwebmail/patches/patch-af
new file mode 100644
index 00000000000..9b355f48e93
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-af
@@ -0,0 +1,20 @@
+$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-ag b/mail/sqwebmail/patches/patch-ag
new file mode 100644
index 00000000000..6667ac55d2c
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/02/18 22:12:56 jlam Exp $
+
+--- configure.orig 2004-12-08 21:17:45.000000000 -0500
++++ configure
+@@ -19379,7 +19379,7 @@ echo "$as_me: error: courierauthconfig n
+ fi
+ $COURIERAUTHCONFIG --configfiles >conftest || exit 1
+ sed 's/^/auth/' <conftest >conftest2
+-. conftest2
++. ./conftest2
+ if test ! -x $authsbindir/courierlogger$EXEEXT
+ then
+ { { echo "$as_me:$LINENO: error: authlib configuration error - $authsbindir/courierlogger$EXEEXT not found" >&5
diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah
new file mode 100644
index 00000000000..06346e24d55
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/02/18 22:12:56 jlam Exp $
+
+--- sqwebmail/configure.orig 2004-11-29 22:53:57.000000000 -0500
++++ sqwebmail/configure
+@@ -19757,7 +19757,7 @@ fi;
+
+
+
+-if test -d ${srcdir}/../courier
++if true || test -d ${srcdir}/../courier
+ then
+ pkglibexecdir='$(libexecdir)/courier'
+ else
diff --git a/mail/sqwebmail/patches/patch-ai b/mail/sqwebmail/patches/patch-ai
new file mode 100644
index 00000000000..6359a1027c3
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-ai
@@ -0,0 +1,38 @@
+$NetBSD: patch-ai,v 1.1 2005/02/18 22:12:56 jlam Exp $
+
+--- sqwebmaild.rc.in.orig 2004-10-20 21:13:12.000000000 -0400
++++ sqwebmaild.rc.in
+@@ -21,14 +21,14 @@ fi
+ startpcp() {
+ case "`cat @sysconfdir@/calendarmode 2>/dev/null`" in
+ net)
+- @SETENV@ - @SHELL@ -c " set -a ;
++ @SETENV@ -i @SHELL@ -c " set -a ;
+ prefix=${prefix} ;
+ exec_prefix=${exec_prefix} ;
+ sbindir=${sbindir} ;
+ libexecdir=${libexecdir} ;
+ . @sysconfdir@/sqwebmaild ; \
+ @courierlogger@ -pid=${PIDFILE}.pcp -start \
+- ${libexecdir}/sqwebmail/pcpd server"
++ ${libexecdir}/courier/pcpd server"
+ ;;
+ *)
+ ;;
+@@ -39,14 +39,14 @@ case $1 in
+ start)
+ startpcp
+
+- @SETENV@ - @SHELL@ -c " set -a ;
++ @SETENV@ -i @SHELL@ -c " set -a ;
+ prefix=${prefix} ;
+ exec_prefix=${exec_prefix} ;
+ sbindir=${sbindir} ;
+ libexecdir=${libexecdir} ;
+ . @sysconfdir@/sqwebmaild ; \
+ @courierlogger@ -pid=${PIDFILE} -start \
+- ${libexecdir}/sqwebmail/sqwebmaild"
++ ${libexecdir}/courier/sqwebmaild"
+ ;;
+
+ stop)
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
new file mode 100644
index 00000000000..97526e57197
--- /dev/null
+++ b/mail/sqwebmail/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/02/18 22:12:56 jlam Exp $
+
+--- INSTALL.html.orig 2004-11-09 20:01:39.000000000 -0500
++++ INSTALL.html
+@@ -681,7 +681,7 @@ is not 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>
+
+-<p><code>/usr/lib/sqwebmail/etc/hostname</code> - when SqWebMail is installed
++<p><code>/usr/lib/sqwebmail/etc/defaultdomain</code> - when SqWebMail is installed
+ with a basic configuration for a single domain, SqWebMail sets the domain in
+ the return address for outgoing messages to the defined system hostname. If
+ this file exists it will be used instead of the defined system hostname.</p>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-17 18:54:50 +0000