diff options
author | jlam <jlam@pkgsrc.org> | 2001-04-30 05:03:24 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-04-30 05:03:24 +0000 |
commit | bf7f4c82a41b5bf09dac89b4c8c8f307a18754fb (patch) | |
tree | 5019f6ee363d1c0b630769a4161fdd803e10c240 | |
parent | 973a745d6d31ea548e8f12eabe5d972545304f37 (diff) | |
download | pkgsrc-bf7f4c82a41b5bf09dac89b4c8c8f307a18754fb.tar.gz |
Update squirrelmail to 1.0.6. Pkgsrc changes include:
- Respect ${APACHE_SYSCONFDIR} setting.
- Install example squirrelmail.conf Apache config file fragment into
${PREFIX}/share/examples/squirrelmail.
Changes from version 1.0.3 include:
- Reworked validation for each page. It's now standardized in validate.php
- Fixed login bug that resulted from 1.0.5 security updates
- Fixed plugin incompatibilities that were introduced in 1.0.5
- Added more security checking to preference saving/loading
- Updated German translation (thanks to Roland Bauerschmidt <rb@debian.org>)
- Updated Finnish help files
- MAJOR security issues addressed. Please upgrade as soon as possible.
- Downloading attachments should work better due to a tip by Ray Black III.
- Fixed bug with drop-down folder list not containing INBOX
- Added Sweedish help files Teemu Junnila <teejun@vallcom.com>
- Added Italian help files Antonetti Roberto <antonr@piceniaweb.com>
- Fixed some bugs with folder creation
- Security fix for UW IMAP server to disallow folder paths outside of $folder_pr
efix
- Some problems with header encoding/decoding fixed
- Made subject column take up whatever width is available
- Added bcc to html addressbook search
-rw-r--r-- | mail/squirrelmail/Makefile | 30 | ||||
-rw-r--r-- | mail/squirrelmail/distinfo | 7 | ||||
-rw-r--r-- | mail/squirrelmail/patches/patch-ab | 14 | ||||
-rw-r--r-- | mail/squirrelmail/pkg/DEINSTALL | 8 | ||||
-rw-r--r-- | mail/squirrelmail/pkg/INSTALL | 8 | ||||
-rw-r--r-- | mail/squirrelmail/pkg/MESSAGE | 4 | ||||
-rw-r--r-- | mail/squirrelmail/pkg/PLIST | 26 |
7 files changed, 58 insertions, 39 deletions
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 0a9a238810f..702a2c44abf 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2001/03/14 15:33:47 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/04/30 05:03:24 jlam Exp $ -DISTNAME= squirrelmail-1.0.3 +DISTNAME= squirrelmail-1.0.6 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squirrelmail/} \ http://nerf-herder.net/squirrel/ \ @@ -17,12 +17,18 @@ USE_PERL5= # defined NO_CONFIGURE= # defined NO_BUILD= # defined -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +.include "../../mk/bsd.prefs.mk" -CONFDIR= ${PREFIX}/etc/httpd -SMDIR= ${PREFIX}/share/squirrelmail -MESSAGE_SUBST+= SMDIR=${SMDIR} +APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +BUILD_DEFS+= APACHE_SYSCONFDIR +MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} + +EGDIR= ${PREFIX}/share/examples/squirrelmail +SMDIR= ${PREFIX}/share/squirrelmail +MESSAGE_SUBST+= SMDIR=${SMDIR} + +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +INSTALL_FILE= ${WRKDIR}/INSTALL post-extract: cd ${WRKSRC}; \ @@ -39,13 +45,15 @@ pre-install: ${SED} -e "s|@SMDIR@|${SMDIR}|g" \ ${FILESDIR}/squirrelmail.conf.dist \ > ${WRKDIR}/squirrelmail.conf.dist - ${SED} -e "s|@SMDIR@|${SMDIR:S/^${PREFIX}\///}|g" \ + ${SED} -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ + -e "s|@SMDIR@|${SMDIR:S/^${PREFIX}\///}|g" \ -e "s|@CAT@|${CAT}|g" \ -e "s|@RM@|${RM}|g" \ -e "s|@RMDIR@|${RMDIR}|g" \ -e "s|@TRUE@|${TRUE}|g" \ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} -e "s|@SMDIR@|${SMDIR:S/^${PREFIX}\///}|g" \ + ${SED} -e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g" \ + -e "s|@SMDIR@|${SMDIR:S/^${PREFIX}\///}|g" \ -e "s|@CAT@|${CAT}|g" \ -e "s|@CHGRP@|${CHGRP}|g" \ -e "s|@CHMOD@|${CHMOD}|g" \ @@ -56,8 +64,8 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: - ${INSTALL_DATA_DIR} ${CONFDIR} ${SMDIR} - cd ${WRKDIR}; ${INSTALL_DATA} squirrelmail.conf.dist ${CONFDIR} + ${INSTALL_DATA_DIR} ${EGDIR} ${SMDIR} + cd ${WRKDIR}; ${INSTALL_DATA} squirrelmail.conf.dist ${EGDIR} ${CP} -R ${WRKSRC}/* ${SMDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR} ${CHMOD} -R a-w ${SMDIR} diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo index 637d626b993..796a31749c5 100644 --- a/mail/squirrelmail/distinfo +++ b/mail/squirrelmail/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 13:10:04 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/04/30 05:03:24 jlam Exp $ -SHA1 (squirrelmail-1.0.3.tar.bz2) = cc190a717bd9e65981f444c10d4e715f0fc42fd1 -Size (squirrelmail-1.0.3.tar.bz2) = 357363 bytes +SHA1 (squirrelmail-1.0.6.tar.bz2) = 2a149f799351180041b8b98a851f0292c220a26e +Size (squirrelmail-1.0.6.tar.bz2) = 376384 bytes SHA1 (patch-aa) = f558b733a37b53e45b3fdf375a0af5731581a18a -SHA1 (patch-ab) = 2c6bc284be80d719d7532ae1d36b6c20d004758e diff --git a/mail/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab deleted file mode 100644 index 8b45e3fe5b4..00000000000 --- a/mail/squirrelmail/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/03/29 16:13:08 bouyer Exp $ - ---- src/right_main.php.orig Thu Mar 29 17:22:25 2001 -+++ src/right_main.php Thu Mar 29 17:20:01 2001 -@@ -81,7 +81,8 @@ - } - - // compensate for the UW vulnerability -- if ($imap_server_type == 'uw' && strstr($mailbox, '/')) { -+ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') || -+ substr($mailbox, 0, 1) == '/')) { - $mailbox = 'INBOX'; - } - diff --git a/mail/squirrelmail/pkg/DEINSTALL b/mail/squirrelmail/pkg/DEINSTALL index 4e2e3865a93..6a1abdaf560 100644 --- a/mail/squirrelmail/pkg/DEINSTALL +++ b/mail/squirrelmail/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.2 2001/02/12 15:15:44 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.3 2001/04/30 05:03:26 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -10,7 +10,9 @@ RM="@RM@" RMDIR="@RMDIR@" TRUE="@TRUE@" -CONFDIR=${PKG_PREFIX}/etc/httpd +APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ +SAMPLECONFDIR=${PKG_PREFIX}/share/examples/squirrelmail +CONFDIR=${APACHE_SYSCONFDIR} DATADIR=/var/spool/squirrelmail SMDIR=${PKG_PREFIX}/@SMDIR@ CONFFILES="config.php" @@ -27,7 +29,7 @@ DEINSTALL) ${RM} -f ${FILE} fi FILE=${CONFDIR}/squirrelmail.conf - SAMPLEFILE=${FILE}.dist + SAMPLEFILE=${SAMPLECONFDIR}/squirrelmail.conf.dist if diff -q ${FILE} ${SAMPLEFILE} >/dev/null then ${RM} -f ${FILE} diff --git a/mail/squirrelmail/pkg/INSTALL b/mail/squirrelmail/pkg/INSTALL index 8affb36457a..58ada7d0434 100644 --- a/mail/squirrelmail/pkg/INSTALL +++ b/mail/squirrelmail/pkg/INSTALL @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.2 2001/02/12 15:15:44 jlam Exp $ +# $NetBSD: INSTALL,v 1.3 2001/04/30 05:03:26 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -15,7 +15,9 @@ MKDIR="@MKDIR@" USER=nobody GROUP=nobody -CONFDIR=${PKG_PREFIX}/etc/httpd +APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ +SAMPLECONFDIR=${PKG_PREFIX}/share/examples/squirrelmail +CONFDIR=${APACHE_SYSCONFDIR} SMDIR=${PKG_PREFIX}/@SMDIR@ DATADIR=/var/spool/squirrelmail @@ -43,7 +45,7 @@ POST-INSTALL) ${CHMOD} 644 ${FILE} fi FILE=${CONFDIR}/squirrelmail.conf - SAMPLEFILE=${FILE}.dist + SAMPLEFILE=${SAMPLECONFDIR}/squirrelmail.conf.dist if [ -f ${FILE} ] then echo " ${FILE} already exists" diff --git a/mail/squirrelmail/pkg/MESSAGE b/mail/squirrelmail/pkg/MESSAGE index fa63eba8fbe..3a769eee73b 100644 --- a/mail/squirrelmail/pkg/MESSAGE +++ b/mail/squirrelmail/pkg/MESSAGE @@ -1,5 +1,5 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.5 2001/03/14 15:33:48 jlam Exp $ +$NetBSD: MESSAGE,v 1.6 2001/04/30 05:03:26 jlam Exp $ You will need to make SquirrelMail accessible through your HTTP server. If you are running Apache and ap-php, then you may either symlink @@ -8,7 +8,7 @@ If you are running Apache and ap-php, then you may either symlink into DocumentRoot, or add the following line to httpd.conf: - Include ${PREFIX}/etc/httpd/squirrelmail.conf + Include ${APACHE_SYSCONFDIR}/squirrelmail.conf to make IMAP accounts accessible through: diff --git a/mail/squirrelmail/pkg/PLIST b/mail/squirrelmail/pkg/PLIST index 533ccf8927f..87f340dcdf0 100644 --- a/mail/squirrelmail/pkg/PLIST +++ b/mail/squirrelmail/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2001/03/14 15:33:48 jlam Exp $ -etc/httpd/squirrelmail.conf.dist +@comment $NetBSD: PLIST,v 1.7 2001/04/30 05:03:26 jlam Exp $ +share/examples/squirrelmail/squirrelmail.conf.dist share/squirrelmail/AUTHORS share/squirrelmail/COPYING share/squirrelmail/ChangeLog @@ -92,6 +92,15 @@ share/squirrelmail/help/fr/options.hlp share/squirrelmail/help/fr/read_mail.hlp share/squirrelmail/help/fr/search.hlp share/squirrelmail/help/index.php +share/squirrelmail/help/it/FAQ.hlp +share/squirrelmail/help/it/addresses.hlp +share/squirrelmail/help/it/basic.hlp +share/squirrelmail/help/it/compose.hlp +share/squirrelmail/help/it/folders.hlp +share/squirrelmail/help/it/main_folder.hlp +share/squirrelmail/help/it/options.hlp +share/squirrelmail/help/it/read_mail.hlp +share/squirrelmail/help/it/search.hlp share/squirrelmail/help/ko/FAQ.hlp share/squirrelmail/help/ko/addresses.hlp share/squirrelmail/help/ko/basic.hlp @@ -119,6 +128,15 @@ share/squirrelmail/help/ru/main_folder.hlp share/squirrelmail/help/ru/options.hlp share/squirrelmail/help/ru/read_mail.hlp share/squirrelmail/help/ru/search.hlp +share/squirrelmail/help/sv/FAQ.hlp +share/squirrelmail/help/sv/addresses.hlp +share/squirrelmail/help/sv/basic.hlp +share/squirrelmail/help/sv/compose.hlp +share/squirrelmail/help/sv/folders.hlp +share/squirrelmail/help/sv/main_folder.hlp +share/squirrelmail/help/sv/options.hlp +share/squirrelmail/help/sv/read_mail.hlp +share/squirrelmail/help/sv/search.hlp share/squirrelmail/images/down_pointer.gif share/squirrelmail/images/index.php share/squirrelmail/images/sm_logo.jpg @@ -204,6 +222,7 @@ share/squirrelmail/src/redirect.php share/squirrelmail/src/right_main.php share/squirrelmail/src/search.php share/squirrelmail/src/signout.php +share/squirrelmail/src/validate.php share/squirrelmail/src/webmail.php share/squirrelmail/themes/README.themes share/squirrelmail/themes/black_bean_burrito_theme.php @@ -271,9 +290,11 @@ share/squirrelmail/themes/slashdot_theme.php @dirrm share/squirrelmail/locale/ca @dirrm share/squirrelmail/locale @dirrm share/squirrelmail/images +@dirrm share/squirrelmail/help/sv @dirrm share/squirrelmail/help/ru @dirrm share/squirrelmail/help/pl @dirrm share/squirrelmail/help/ko +@dirrm share/squirrelmail/help/it @dirrm share/squirrelmail/help/fr @dirrm share/squirrelmail/help/fi @dirrm share/squirrelmail/help/en @@ -283,3 +304,4 @@ share/squirrelmail/themes/slashdot_theme.php @dirrm share/squirrelmail/functions @dirrm share/squirrelmail/doc @dirrm share/squirrelmail/data +@dirrm share/examples/squirrelmail |