Pullup ticket 1794 - requested by taca

security update for ja-squirrelmail

Revisions pulled up:
- pkgsrc/mail/ja-squirrelmail/Makefile			1.31-1.32
- pkgsrc/mail/ja-squirrelmail/PLIST			1.5-1.6
- pkgsrc/mail/ja-squirrelmail/distinfo			1.12
- pkgsrc/mail/ja-squirrelmail/patches/patch-ab		removed
- pkgsrc/mail/ja-squirrelmail/patches/patch-ac		removed

   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Aug 17 13:24:46 UTC 2006

   Modified Files:
	pkgsrc/mail/ja-squirrelmail: Makefile PLIST distinfo
   Removed Files:
	pkgsrc/mail/ja-squirrelmail/patches: patch-ab patch-ac

   Log Message:
   Update ja-squirrelmail package to 1.4.8.

   Changes from 1.4.7:
   - A security fix for CVE-2006-4019
   - A collection of bugfixes

   Changes from 1.4.6:
   - Fixed URL for Read Receipts being incorrect in some cases (#1177518).
   - Fixed endless loop when trying to parse "From: )(" (#1517867).
   - Using is_file() instead of file_exists() in fortune plugin (#1499134).
   - Add manual page for conf.pl under contrib.
   - Don't allow selecting INBOX as Sent, Draft or Trash folder (#1242346).
---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sat Aug 19 14:49:36 UTC 2006

   Modified Files:
	pkgsrc/mail/ja-squirrelmail: Makefile PLIST

   Log Message:
   - Fix PLIST.
   - Add APACHE_GROUP, APACHE_USER and VARBASE to BUILD_DEFS.

   Bump PKGREVISION.

3 files changed, 24 insertions, 22 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 6ae9dcac5b7..bab8e732fda 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2006/06/04 12:31:31 tron Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2006/08/20 10:43:02 ghen Exp $
 
-DISTNAME=	squirrelmail-1.4.6
+DISTNAME=	squirrelmail-1.4.8
 PKGNAME=	ja-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=	.tar.bz2
 
 #PATCH_SITES=	http://www.yamaai-tech.com/~masato/Download/
 PATCH_SITES=	ftp://ftp.back-street.net/pub/squirrelmail/
-PATCHFILES=	squirrelmail-1.4.6-ja-20060504-patch
+PATCHFILES=	squirrelmail-1.4.8-ja-20060812-patch
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.squirrelmail.jp/
@@ -26,6 +26,7 @@ USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
 REPLACE_PERL+=	config/conf.pl
+BUILD_DEFS+=	APACHE_GROUP APACHE_USER VARBASE
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/ja-squirrelmail/PLIST b/mail/ja-squirrelmail/PLIST
index 3e8f2b2970b..420feb604d6 100644
--- a/mail/ja-squirrelmail/PLIST
+++ b/mail/ja-squirrelmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/05 05:32:36 martti Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2006/08/20 10:43:02 ghen Exp $
 share/examples/squirrelmail/squirrelmail.conf
 share/squirrelmail/AUTHORS
 share/squirrelmail/COPYING
@@ -35,6 +35,7 @@ share/squirrelmail/contrib/RPM/config.php.redhat
 share/squirrelmail/contrib/RPM/squirrelmail.conf
 share/squirrelmail/contrib/RPM/squirrelmail.cron
 share/squirrelmail/contrib/RPM/squirrelmail.spec
+share/squirrelmail/contrib/conf.pl.8
 share/squirrelmail/contrib/decrypt_headers.php
 share/squirrelmail/contrib/squirrelmail.mailto.NT2KXP.reg
 share/squirrelmail/contrib/squirrelmail.mailto.Win9x.reg
@@ -42,12 +43,6 @@ share/squirrelmail/contrib/squirrelmail.mailto.reg
 share/squirrelmail/data/.htaccess
 share/squirrelmail/data/default_pref
 share/squirrelmail/data/index.php
-share/squirrelmail/doc/Development/addressbook.txt
-share/squirrelmail/doc/Development/index.html
-share/squirrelmail/doc/Development/mime.txt
-share/squirrelmail/doc/Development/plugin.txt
-share/squirrelmail/doc/Development/rfc_documents.txt
-share/squirrelmail/doc/Development/tree.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.0.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.1.txt
 share/squirrelmail/doc/ReleaseNotes/1.2/Notes-1.2.2.txt
@@ -65,6 +60,8 @@ share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.3a.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.4.txt
 share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.5.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.6.txt
+share/squirrelmail/doc/ReleaseNotes/1.4/Notes-1.4.7.txt
 share/squirrelmail/doc/authentication.txt
 share/squirrelmail/doc/db-backend.txt
 share/squirrelmail/doc/ie_ssl.txt
@@ -317,7 +314,6 @@ share/squirrelmail/plugins/translate/README
 share/squirrelmail/plugins/translate/index.php
 share/squirrelmail/plugins/translate/options.php
 share/squirrelmail/plugins/translate/setup.php
-share/squirrelmail/po/charsetconvert.pl
 share/squirrelmail/po/compilepo
 share/squirrelmail/po/independent_strings.txt
 share/squirrelmail/po/index.php
@@ -364,12 +360,17 @@ share/squirrelmail/src/view_text.php
 share/squirrelmail/src/webmail.php
 share/squirrelmail/themes/README.themes
 share/squirrelmail/themes/alien_glow.php
+share/squirrelmail/themes/autumn.php
+share/squirrelmail/themes/autumn2.php
 share/squirrelmail/themes/black_bean_burrito_theme.php
 share/squirrelmail/themes/blue_grey_theme.php
+share/squirrelmail/themes/blue_on_blue.php
 share/squirrelmail/themes/bluesnews_theme.php
 share/squirrelmail/themes/bluesome.php
 share/squirrelmail/themes/bluesteel_theme.php
 share/squirrelmail/themes/christmas.php
+share/squirrelmail/themes/classic_blue.php
+share/squirrelmail/themes/classic_blue2.php
 share/squirrelmail/themes/css/comic-sans-08.css
 share/squirrelmail/themes/css/comic-sans-10.css
 share/squirrelmail/themes/css/comic-sans-12.css
@@ -407,6 +408,7 @@ share/squirrelmail/themes/monostochastic.php
 share/squirrelmail/themes/netstyle_theme.php
 share/squirrelmail/themes/penguin.php
 share/squirrelmail/themes/plain_blue_theme.php
+share/squirrelmail/themes/powder_blue.php
 share/squirrelmail/themes/purple_theme.php
 share/squirrelmail/themes/random.php
 share/squirrelmail/themes/redmond.php
@@ -422,6 +424,8 @@ share/squirrelmail/themes/slashdot_theme.php
 share/squirrelmail/themes/spice_of_life.php
 share/squirrelmail/themes/spice_of_life_dark.php
 share/squirrelmail/themes/spice_of_life_lite.php
+share/squirrelmail/themes/techno_blue.php
+share/squirrelmail/themes/turquoise.php
 share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/themes/css
 @dirrm share/squirrelmail/themes
@@ -462,7 +466,6 @@ share/squirrelmail/themes/wood_theme.php
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.3
 @dirrm share/squirrelmail/doc/ReleaseNotes/1.2
 @dirrm share/squirrelmail/doc/ReleaseNotes
-@dirrm share/squirrelmail/doc/Development
 @dirrm share/squirrelmail/doc
 @dirrm share/squirrelmail/data
 @dirrm share/squirrelmail/contrib/RPM
diff --git a/mail/ja-squirrelmail/distinfo b/mail/ja-squirrelmail/distinfo
index aa2fe9cc254..92cd82195ce 100644
--- a/mail/ja-squirrelmail/distinfo
+++ b/mail/ja-squirrelmail/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.11 2006/06/04 12:31:31 tron Exp $
+$NetBSD: distinfo,v 1.11.2.1 2006/08/20 10:43:02 ghen Exp $
 
-SHA1 (squirrelmail-1.4.6.tar.bz2) = b813aa9f736b4b6c41d1afd35bcbd01604e85cf7
-RMD160 (squirrelmail-1.4.6.tar.bz2) = 3cee894b392620af3e35ef1d00e35775559dd4f7
-Size (squirrelmail-1.4.6.tar.bz2) = 484099 bytes
-SHA1 (squirrelmail-1.4.6-ja-20060504-patch) = 15b17d2f1b8d9c19b01cc23bf6148ac7ee0e77ce
-RMD160 (squirrelmail-1.4.6-ja-20060504-patch) = 7cb0a584afaffe73176edd75886fe7536363aefe
-Size (squirrelmail-1.4.6-ja-20060504-patch) = 29808 bytes
+SHA1 (squirrelmail-1.4.8-ja-20060812-patch) = 98e33681ff6275097f08648291ac9685d55d636a
+RMD160 (squirrelmail-1.4.8-ja-20060812-patch) = 01dd26fe7769528d37fc4c853b16b7af81ebd84f
+Size (squirrelmail-1.4.8-ja-20060812-patch) = 8341 bytes
+SHA1 (squirrelmail-1.4.8.tar.bz2) = 45bab996b68b60647e668070466c15a20e991d52
+RMD160 (squirrelmail-1.4.8.tar.bz2) = 7ef716a1b34d477a77157b56a71feb7e0a1c41cb
+Size (squirrelmail-1.4.8.tar.bz2) = 474528 bytes
 SHA1 (patch-aa) = c96e85a28464c414bef744f9d1398fc9dd49549a
-SHA1 (patch-ab) = a7648438c9764e432e5d040e8e3aebb0ab48730e
-SHA1 (patch-ac) = 393579f9276169d2c765726fb1249160a270e983