Pullup ticket 1698 - requested by salo

security update for sylpheed

Revisions pulled up:
- pkgsrc/mail/sylpheed/Makefile		1.92, 1.93, 1.96
- pkgsrc/mail/sylpheed/distinfo		1.48, 1.49, 1.50
- pkgsrc/mail/sylpheed/options.mk	1.2

   Module Name:	pkgsrc
   Committed By:	xtraeme
   Date:		Wed Mar 29 22:04:57 UTC 2006

   Modified Files:
	pkgsrc/mail/sylpheed: Makefile distinfo

   Log Message:
   Update to:

   * 2.2.3 (stable)

       * The sorting of the result of the query search was enabled.
       * The printing of messages now follows the state of 'Show all headers'.
       * Relative path is allowed for signature files.
       * The To, Cc, and Bcc button of the address book are now always enabled.
       * The window position of the address book is now preserved.
       * The toggle of the Cc entry on the composition window was enabled.
       * The appearance of the address book was modified.
       * Unix: The support of metamail command was removed, and it was replaced
         with the alternative implementation.
       * Win32: libwimp.dll was updated, and the appearance of the UI was
         improved.
       * Win32: zlib1.dll was updated.
       * Win32: The application icon was updated.
       * Win32: The unnecessary message catalog files were removed to reduce the
         archive size.
---
   Module Name:	pkgsrc
   Committed By:	chris
   Date:		Wed Mar 29 22:54:42 UTC 2006

   Modified Files:
	pkgsrc/mail/sylpheed: Makefile distinfo options.mk

   Log Message:
   Update sylpheed to 2.2.4. Changes are:
       * MIME filename encoding with RFC 2322 parameter value extension was
         supported.
       * The clear button for the quick search entry was added.
       * The bug that bold face was disabled in GtkTreeView with GLib 2.10
         and Pango 1.12 was fixed.
       * Win32: libwimp.dll was updated.
       * Win32: The bug that subfolders were duplicated when rebuilding
         folder tree while the settings were shared between Win32 and Unix
         was fixed.
       * Win32: The uninstaller was modified so that it only removes files
         and folders created by the installer.

   Also remove extra blank lines at the end of options.mk to appease pkglint.
---
   Module Name:	pkgsrc
   Committed By:	xtraeme
   Date:		Sat Jun 10 23:38:36 UTC 2006

   Modified Files:
	pkgsrc/mail/sylpheed: Makefile distinfo

   Log Message:
   Update to 2.2.6.

   Changes 2.2.6:

       * The 8-bit literal (literal8) in IMAP4 response was supported.
       * The missing timeout handling was added for SMTP.
       * The failure of URI security check when they have leading space
         was fixed.

   Changes 2.2.5:

       * The character corruption and crash bug when using Japanese
         half-width kana on sending messages was fixed.
       * The execution failure when using the accessibility module was fixed.
       * The bug that new/unread count becoming negative value was fixed.
       * The bug that bold face was disabled in the folder selection dialog
         with GLib 2.10 and Pango 1.12 was fixed.
       * The incorrect progressbar display when expired messages exist was
         fixed.

3 files changed, 7 insertions, 10 deletions

diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index f8c20935b75..b7bce14f097 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2006/03/04 09:09:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.91.2.1 2006/06/13 15:30:29 ghen Exp $
 
-DISTNAME=	sylpheed-2.2.2
+DISTNAME=	sylpheed-2.2.6
 CATEGORIES=	mail news x11
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-claws/}
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.2/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -11,7 +10,6 @@ HOMEPAGE=	http://sylpheed.good-day.net/index.cgi.en
 COMMENT=	X based e-mail and netnews client
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=		metamail>=2.7:../../mail/metamail
 
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 
diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo
index 801a73942aa..d64aa239d91 100644
--- a/mail/sylpheed/distinfo
+++ b/mail/sylpheed/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.47 2006/03/04 09:09:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.47.2.1 2006/06/13 15:30:29 ghen Exp $
 
-SHA1 (sylpheed-2.2.2.tar.bz2) = 197eba6d2bfe28f03c77569bf96345e373725ac5
-RMD160 (sylpheed-2.2.2.tar.bz2) = 174433a595add20aba181e376e23b728eb7dac98
-Size (sylpheed-2.2.2.tar.bz2) = 2510018 bytes
+SHA1 (sylpheed-2.2.6.tar.bz2) = 2924112d10f0440baab973d0a4651a629b141672
+RMD160 (sylpheed-2.2.6.tar.bz2) = 020045ee924cc7a4aea26ca6bc558945a4b20c83
+Size (sylpheed-2.2.6.tar.bz2) = 2537355 bytes
diff --git a/mail/sylpheed/options.mk b/mail/sylpheed/options.mk
index b9627d2825b..c8e38157dab 100644
--- a/mail/sylpheed/options.mk
+++ b/mail/sylpheed/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/02/19 07:11:08 xtraeme Exp $
+# $NetBSD: options.mk,v 1.1.2.1 2006/06/13 15:30:29 ghen Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sylpheed
@@ -44,4 +44,3 @@ CONFIGURE_ARGS+=	--enable-gpgme
 .else
 CONFIGURE_ARGS+=	--disable-gpgme
 .endif
-