Update mail/sqwebmail to 4.0.5 (based on the courier-0.45.6 distribution).

Changes from version 3.6.2 include:

  * Honor ${VARBASE}.
  * Remove pcpd and sqwebmaild rc.d scripts and replace them with a
    single sqwebmail rc.d script that calls the Courier-provided control
    script to start/stop the SqWebMail service daemons.
  * Use sysconftool from courier-auth to merge config files.
  * Move HTML documentation into ${PREFIX}/share/doc after discussion
    with wiz.
  * Support for the ACL IMAP extension.
  * Improve support for MIME encodings.
  * Fixes buffer overflow vulnerability (PR 25774):
	http://www.securityfocus.com/bid/9845
	http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0224
This commit is contained in:
jlam 2004-07-14 20:07:22 +00:00
parent bfa796133d
commit f3a4f736b9
12 changed files with 150 additions and 231 deletions

View file

@ -1,10 +1,17 @@
# $NetBSD: DEINSTALL,v 1.2 2004/02/23 23:41:43 jlam Exp $
# $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@/calendarmode"
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@/nochangingfrom"
ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/noimages"
ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/usexsender"
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"
case ${STAGE} in
DEINSTALL)
# Unconditionally remove the SqWebMail socket.
${RM} -f @SQWEBMAIL_STATEDIR@/sqwebmail.sock
esac

View file

@ -1,3 +1,3 @@
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.
maildir mailboxes. It is very lightweight -- it reads mail directly
from maildirs.

View file

@ -1,19 +0,0 @@
# $NetBSD: INSTALL,v 1.1 2002/01/24 20:52:20 jlam Exp $
SYSCONFTOOL="@SYSCONFTOOL@"
EGDIR=${PKG_PREFIX}/share/examples/courier
GEN_FILES="@GEN_FILES@"
case ${STAGE} in
POST-INSTALL)
eval set -- ${GEN_FILES}
for file
do
# Merge new config files with the old ones.
${CP} ${EGDIR}/${file}.dist @PKG_SYSCONFDIR@/${file}.dist
${SYSCONFTOOL} @PKG_SYSCONFDIR@/${file}
${CHMOD} 0644 @PKG_SYSCONFDIR@/${file}
${RM} -f @PKG_SYSCONFDIR@/${file}.dist
done
;;
esac

View file

@ -1,27 +1,26 @@
# $NetBSD: Makefile,v 1.23 2004/05/12 23:48:52 wiz Exp $
# $NetBSD: Makefile,v 1.24 2004/07/14 20:07:22 jlam Exp $
DISTNAME= sqwebmail-3.6.2
DISTNAME= sqwebmail-4.0.5
CATEGORIES= www
COMMENT= webmail CGI for access to local Maildir-style mailboxes
COMMENT= webmail CGI for access to local maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/sqwebmail/
DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth
DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
DEPENDS+= courier-maildir>=${BASE_VERS}:../../mail/courier-maildir
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
USE_PERL5= yes
REPLACE_PERL= sysconftool
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
INSTALL_EXTRA_TMPL+= ${.CURDIR}/../courier-auth/INSTALL
.include "../courier-auth/Makefile.common"
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
SQWEBMAIL_STATEDIR= /var/sqwebmail
SQWEBMAIL_STATEDIR= ${VARBASE}/sqwebmail
SQWEBMAIL_CACHEDIR= ${SQWEBMAIL_STATEDIR}/cache
SQWEBMAIL_CALENDARDIR= ${SQWEBMAIL_STATEDIR}/calendar
SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html
@ -33,7 +32,7 @@ FILES_SUBST+= SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
SENDMAIL?= /usr/sbin/sendmail
# This is used by the sqwebmail configure script to set the location of
# the sqwebmaild socket file, lockfile, and pidfile.
# the sqwebmaild socket file, lockfile and pidfile.
#
CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR}
@ -63,14 +62,13 @@ 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
SYSCONFTOOL= ${PREFIX}/sbin/sqwebmail.sysconftool
GEN_FILES= ldapaddressbook
FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q}
GEN_FILES+= sqwebmaild
FILES_SUBST+= GEN_FILES=${GEN_FILES:Q}
MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL}
SUPPORT_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist
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}
@ -81,7 +79,7 @@ CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \
${PKG_SYSCONFDIR}/${FILE} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
RCD_SCRIPTS= pcpd sqwebmail sqwebmaild
RCD_SCRIPTS= sqwebmail
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
@ -94,20 +92,27 @@ pre-configure:
$$file.bak > $$file; \
done
# Default to non-groupware calendar-mode.
post-build:
${ECHO} "local" > ${WRKDIR}/calendarmode
post-install:
${LN} -sf ${DATADIR}/sqwebmail/webgpg ${PREFIX}/sbin/webgpg
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA_DIR} ${HTMLDIR}
${INSTALL_DATA_DIR} ${HTMLDIR}/pcp
${INSTALL_DATA_DIR} ${HTMLDIR}/sqwebmail
${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
${INSTALL_DATA} ${WRKSRC}/COPYING ${HTMLDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${HTMLDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \
${HTMLDIR}/sqwebmail/README.gpg.html
${INSTALL_DATA} ${WRKSRC}/pcp/README.html \
${HTMLDIR}/sqwebmail/README.pcp.html
${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${HTMLDIR}/sqwebmail
${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${HTMLDIR}/sqwebmail
${INSTALL_DATA} ${WRKDIR}/calendarmode ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR}
${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
${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${DOCDIR}/sqwebmail
.include "../../mk/bsd.pkg.mk"

View file

@ -1,10 +1,11 @@
@comment $NetBSD: PLIST,v 1.2 2004/02/23 23:41:43 jlam Exp $
@comment $NetBSD: PLIST,v 1.3 2004/07/14 20:07:22 jlam Exp $
libexec/cgi-bin/sqwebmail
libexec/courier/sqwebmail/makemime
libexec/courier/sqwebmail/pcpd
libexec/courier/sqwebmail/reformime
libexec/courier/sqwebmail/sqwebmaild
sbin/sqwebmail.sysconftool
libexec/courier/sqwebmaild.rc
sbin/webgpg
share/courier/sqwebmail/cleancache.pl
share/courier/sqwebmail/html/en
share/courier/sqwebmail/html/en-us/CHARSET
@ -14,6 +15,7 @@ share/courier/sqwebmail/html/en-us/LANGUAGE_PREF
share/courier/sqwebmail/html/en-us/LOCALE
share/courier/sqwebmail/html/en-us/TIMEZONELIST
share/courier/sqwebmail/html/en-us/abooklist.html
share/courier/sqwebmail/html/en-us/acl.html
share/courier/sqwebmail/html/en-us/attachments.html
share/courier/sqwebmail/html/en-us/autoresponder.html
share/courier/sqwebmail/html/en-us/calendarlogin.inc.html
@ -74,6 +76,7 @@ share/courier/sqwebmail/images/graybottomleft.png
share/courier/sqwebmail/images/graybottomright.png
share/courier/sqwebmail/images/graytopleft.png
share/courier/sqwebmail/images/graytopright.png
share/courier/sqwebmail/images/key.png
share/courier/sqwebmail/images/last.png
share/courier/sqwebmail/images/left.png
share/courier/sqwebmail/images/left2.png
@ -102,17 +105,20 @@ share/courier/sqwebmail/images/uncancel.png
share/courier/sqwebmail/ldapsearch
share/courier/sqwebmail/sendit.sh
share/courier/sqwebmail/webgpg
share/doc/html/courier/sqwebmail/BUGS.html
share/doc/html/courier/sqwebmail/COPYING
share/doc/html/courier/sqwebmail/INSTALL.html
share/doc/html/courier/sqwebmail/README.gpg.html
share/doc/html/courier/sqwebmail/README.pcp.html
share/doc/html/courier/sqwebmail/SECURITY.html
share/examples/courier/authmodulelist
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
@unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE}
@dirrm share/doc/html/courier/sqwebmail
@dirrm share/doc/courier/sqwebmail
@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE}
@dirrm share/courier/sqwebmail/images
@dirrm share/courier/sqwebmail/html/en-us

View file

@ -1,7 +1,9 @@
$NetBSD: distinfo,v 1.3 2004/02/23 23:41:43 jlam Exp $
$NetBSD: distinfo,v 1.4 2004/07/14 20:07:22 jlam Exp $
SHA1 (sqwebmail-3.6.2.tar.bz2) = 718b4456c9429b37153e4d4e7a0801e4901aaa73
Size (sqwebmail-3.6.2.tar.bz2) = 1649032 bytes
SHA1 (patch-aa) = c879d95b44a9d7a02c8dd119ca5645add6f96e1e
SHA1 (patch-ab) = a2cba8fbfd020e597a99111efc4a2522d68c2872
SHA1 (patch-ad) = 47d4ae3b31e6765bf180155b7e7f1472ebf8966b
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

View file

@ -1,51 +0,0 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: pcpd.sh,v 1.2 2004/02/24 01:18:52 jlam Exp $
#
# Courier SqWebMail calendaring services daemon
#
# PROVIDE: pcpd
# REQUIRE: authdaemond
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="pcpd"
rcvar=${name}
command="@PREFIX@/libexec/courier/sqwebmail/pcpd"
required_files="@PKG_SYSCONFDIR@/calendarmode"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
courier_doit()
{
action=$1
case ${action} in
start)
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ "$0: WARNING: $f is not readable"
if [ -z $rc_force ]; then
return 1
fi
fi
done
@ECHO@ "Starting ${name}."
;;
stop)
@ECHO@ "Stopping ${name}."
;;
esac
${command} ${action}
}
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
${start_cmd}
fi

View file

@ -1,53 +1,67 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: sqwebmail.sh,v 1.1 2004/02/24 01:20:21 jlam Exp $
# $NetBSD: sqwebmail.sh,v 1.2 2004/07/14 20:07:22 jlam Exp $
#
# KEYWORD: nostart
# Courier SqWebMail services daemon
#
# PROVIDE: sqwebmail
# REQUIRE: authdaemond
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
rcd_dir=`@DIRNAME@ $0`
name="sqwebmail"
rcvar=${name}
command="@PREFIX@/sbin/courierlogger"
ctl_command="@PREFIX@/libexec/courier/sqwebmaild.rc"
pidfile="/var/run/sqwebmaild.pid"
required_files="@PKG_SYSCONFDIR@/calendarmode @PKG_SYSCONFDIR@/sqwebmaild"
required_vars="authdaemond"
# NOTE: run_rc_command sets $rc_arg
#
forward_commands()
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
courier_doit()
{
# Backward compat with NetBSD <1.6:
[ -z "$rc_arg" ] && rc_arg=$_arg
action=$1
case ${action} in
start)
for _f in $required_vars; do
eval _value=\$${_f}
case $_value in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
;;
*)
@ECHO@ 1>&2 "$0: WARNING: \$${_f} is not set"
if [ -z $rc_force ]; then
return 1
fi
;;
esac
done
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ 1>&2 "$0: WARNING: $f is not readable"
if [ -z $rc_force ]; then
return 1
fi
fi
done
@ECHO@ "Starting ${name}."
;;
stop)
@ECHO@ "Stopping ${name}."
;;
esac
for file in $COMMAND_LIST; do
$rcd_dir/$file $rc_arg
done
${ctl_command} ${action}
}
reverse_commands()
{
# Backward compat with NetBSD <1.6:
[ -z "$rc_arg" ] && rc_arg=$_arg
REVCOMMAND_LIST=
for file in $COMMAND_LIST; do
REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
done
for file in $REVCOMMAND_LIST; do
$rcd_dir/$file $rc_arg
done
}
COMMAND_LIST="pcpd sqwebmaild"
name="samba"
start_cmd="forward_commands"
stop_cmd="reverse_commands"
status_cmd="forward_commands"
extra_commands="reload status"
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
_arg="$1"
${start_cmd}
fi

View file

@ -1,52 +0,0 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: sqwebmaild.sh,v 1.3 2004/02/24 01:20:54 jlam Exp $
#
# Courier SqWebMail services daemon
#
# PROVIDE: sqwebmaild
# REQUIRE: authdaemond
if [ -f /etc/rc.subr ]; then
. /etc/rc.subr
fi
name="sqwebmaild"
rcvar=${name}
command="@PREFIX@/libexec/courier/sqwebmail/sqwebmaild"
pidfile="@SQWEBMAIL_STATEDIR@/sqwebmail.sock.pid"
required_files="@PKG_SYSCONFDIR@/authmodulelist"
start_cmd="courier_doit start"
stop_cmd="courier_doit stop"
courier_doit()
{
action=$1
case ${action} in
start)
for f in $required_files; do
if [ ! -r "$f" ]; then
@ECHO@ "$0: WARNING: $f is not readable"
if [ -z $rc_force ]; then
return 1
fi
fi
done
@ECHO@ "Starting ${name}."
;;
stop)
@ECHO@ "Stopping ${name}."
;;
esac
${command} ${action}
}
if [ -f /etc/rc.subr ]; then
load_rc_config $name
run_rc_command "$1"
else
@ECHO@ -n " ${name}"
${start_cmd}
fi

View file

@ -1,33 +1,42 @@
$NetBSD: patch-aa,v 1.2 2004/02/23 23:41:43 jlam Exp $
$NetBSD: patch-aa,v 1.3 2004/07/14 20:07:22 jlam Exp $
--- Makefile.in.orig Thu Nov 27 16:46:50 2003
+++ Makefile.in
@@ -156,9 +156,9 @@ sysconf_DATA = authmodulelist
@HAS_USERDB_TRUE@userdb_data = makeuserdb.8 userdb.8 userdbpw.8
--- 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 =
scriptbindir = $(sbindir)
-scriptbin_SCRIPTS = $(userdb_scripts)
+scriptbin_SCRIPTS =
-scriptbin_SCRIPTS = $(userdb_scripts) \
- sharedindexinstall sharedindexsplit
-
+scriptbin_SCRIPTS =
-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd authenumerate
+pkglibPROGRAMS = reformime makemime pcpd
pkglibexecdir = $(libexecdir)/sqwebmail
pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
@@ -168,10 +168,10 @@ EXTRA_PROGRAMS =
CLEANFILES = $(userdb_scripts) $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA)
libexec_SCRIPTS = sqwebmaild.rc
-pkgsbinPROGRAMS = courierlogger
+pkgsbinPROGRAMS =
pkgsbindir = $(sbindir)
pkgsbin_PROGRAMS = @pkgsbinPROGRAMS_exec@
@@ -177,10 +175,10 @@
pkgman8dir = @mandir@/man8
-pkgman8_DATA = deliverquota.8 $(userdb_data)
+pkgman8_DATA =
+pkgman8_DATA =
pkgman1dir = @mandir@/man1
-pkgman1_DATA = maildirmake.1
+pkgman1_DATA =
+pkgman1_DATA =
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -773,44 +773,21 @@ makemime: rfc2045/makemime
@@ -826,42 +824,20 @@
# Install SqWebMail setuid to root, if we're running as root
#
@ -71,7 +80,5 @@ $NetBSD: patch-aa,v 1.2 2004/02/23 23:41:43 jlam Exp $
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- cp /dev/null $(DESTDIR)$(sysconfdir)/nodsn
@cat sqwebmail/sqwebmail.msg
- @cat authlib/authdaemon.msg
uninstall-local: uninstall-userdb-local uninstall-userdb-script
test -w $(DESTDIR)$(cgibindir) || exit 0; \

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.2 2004/02/23 23:41:43 jlam Exp $
$NetBSD: patch-ab,v 1.3 2004/07/14 20:07:22 jlam Exp $
--- authlib/Makefile.in.orig Sat Nov 15 13:33:23 2003
+++ authlib/Makefile.in
@@ -1279,7 +1279,7 @@ info: info-am
--- 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:

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.2 2004/02/23 23:41:43 jlam Exp $
$NetBSD: patch-ad,v 1.3 2004/07/14 20:07:22 jlam Exp $
--- sqwebmail/Makefile.in.orig Thu Nov 27 16:47:01 2003
+++ sqwebmail/Makefile.in
@@ -817,7 +817,7 @@ install-perms-local: install-perms-cache
--- 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 @@
htmllibdir.h: config.status
echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@ -11,12 +11,12 @@ $NetBSD: patch-ad,v 1.2 2004/02/23 23:41:43 jlam Exp $
echo '#define NOCHANGINGFROM "$(sysconfdir)/nochangingfrom"' >>htmllibdir.h
echo '#define USEXSENDER "$(sysconfdir)/usexsender"' >>htmllibdir.h
echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
@@ -835,7 +835,7 @@ htmllibdir.h: config.status
@@ -850,7 +850,7 @@
; 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 MODULEFILE "$(sysconfdir)/authmodulelist"' >>htmllibdir.h
echo '#define NOIMAGES "$(sysconfdir)/noimages"' >>htmllibdir.h
echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h