From e2fc76091004e0dea295cbeffff62e96f171b79c Mon Sep 17 00:00:00 2001
From: tonio <tonio@pkgsrc.org>
Date: Thu, 18 Jan 2007 18:26:21 +0000
Subject: Avoid segfault when parsing configuration file under netbsd

---
 mail/isync/Makefile         |  5 +++--
 mail/isync/distinfo         |  3 ++-
 mail/isync/patches/patch-ae | 13 +++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 mail/isync/patches/patch-ae

(limited to 'mail/isync')

diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index d7c1f52b74c..c5b1a568985 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/18 10:27:11 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2007/01/18 18:26:21 tonio Exp $
 #
 
 DISTNAME=	isync-1.0.3
+PKGREVISION=	1
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
@@ -10,6 +11,7 @@ HOMEPAGE=	http://isync.sourceforge.net/
 COMMENT=	Synchronize a maildir with an imap server
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+INSTALLATION_DIRS+= share/examples/isync
 
 GNU_CONFIGURE=	YES
 
@@ -20,7 +22,6 @@ LDFLAGS+=		-lcrypto
 .include "../../databases/db4/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
 	${INSTALL_DATA} ${WRKSRC}/src/mbsyncrc.sample \
 		${PREFIX}/share/examples/isync/mbsyncrc.sample
 	${INSTALL_DATA} ${WRKSRC}/src/compat/isyncrc.sample \
diff --git a/mail/isync/distinfo b/mail/isync/distinfo
index fff0aa2d422..79894e7b221 100644
--- a/mail/isync/distinfo
+++ b/mail/isync/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/01/18 10:27:11 tonio Exp $
+$NetBSD: distinfo,v 1.8 2007/01/18 18:26:21 tonio Exp $
 
 SHA1 (isync-1.0.3.tar.gz) = 21500bb486ea0b8e9eae680f835a5a58ffe6a0d3
 RMD160 (isync-1.0.3.tar.gz) = c1ed6e3691eebbe97a57247102afb6794556bdb2
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 5ac207f7d7b634673e60ce34cc9a921846d205da
 SHA1 (patch-ab) = bee5b091f89a670b584b73ef58774ae992bb6637
 SHA1 (patch-ac) = d06d1444f66eaeab1fdf22e1aa2f1b9184abccfa
 SHA1 (patch-ad) = c4a86de19b3004752dc51da9453b702945fe6578
+SHA1 (patch-ae) = 2fddc575e8824ecbbb4b8c51a56193840b43d647
diff --git a/mail/isync/patches/patch-ae b/mail/isync/patches/patch-ae
new file mode 100644
index 00000000000..75e1617f07e
--- /dev/null
+++ b/mail/isync/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2007/01/18 18:26:21 tonio Exp $
+
+--- src/config.c.orig	2006-11-01 07:54:31.000000000 +0100
++++ src/config.c
+@@ -252,7 +252,7 @@ int
+ load_config( const char *where, int pseudo )
+ {
+ 	conffile_t cfile;
+-	store_conf_t *store, **storeapp = &stores, **sptarg;
++	store_conf_t *store = NULL, **storeapp = &stores, **sptarg;
+ 	channel_conf_t *channel, **channelapp = &channels;
+ 	group_conf_t *group, **groupapp = &groups;
+ 	string_list_t *chanlist, **chanlistapp;
-- 
cgit v1.2.3