- Fix segmentation faults on amd64.

- Reset maintainer due to multiple long response timeouts.

PR:		139867
Submitted by:	Bartosz Stec <admin@kkip.pl>
Patch by:	arved

3 files changed, 141 insertions, 5 deletions

diff --git a/mail/isoqlog/Makefile b/mail/isoqlog/Makefile
index 1c5450724739..c3d253ee0f2f 100644
--- a/mail/isoqlog/Makefile
+++ b/mail/isoqlog/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	isoqlog
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/isoqlog/ \
 		http://www.trunix.org/projeler/isoqlog/ \
 		http://www.acikkod.org/softwares/
 
-MAINTAINER=	ofsen@enderunix.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A qmail, postfix, sendmail, exim MTA log analysis program
 
 GNU_CONFIGURE=	yes
@@ -22,10 +23,6 @@ SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN=		Segmentation faults on amd64 (see ports/139867 for details)
-.endif
-
 .ifdef NOPORTDOCS
 post-patch:
 	@${REINPLACE_CMD} -e '/install-data-am:/s/install-${PORTNAME}_docDATA//' \
diff --git a/mail/isoqlog/files/patch-Data.c b/mail/isoqlog/files/patch-Data.c
new file mode 100644
index 000000000000..b51c9e91434d
--- /dev/null
+++ b/mail/isoqlog/files/patch-Data.c
@@ -0,0 +1,119 @@
+--- isoqlog/Data.c.orig	2010-08-09 16:54:25.000000000 +0200
++++ isoqlog/Data.c	2010-08-09 17:00:37.000000000 +0200
+@@ -173,34 +173,35 @@
+ 
+ int addUserToSortTab(user *usr)
+ {
+-	int *u;
++	user* *u;
+ 
+ 	if (SortDomain.allusers == NULL) { /* first time */
+-		SortDomain.allusers = (int *)malloc(NVINIT * sizeof(int *));
++		SortDomain.allusers = malloc(NVINIT * sizeof(user**));
+ 		if (SortDomain.allusers == NULL)
+ 			return -1;
+ 		SortDomain.max = NVINIT;
+ 		SortDomain.nval = 0;
+ 	} else
+ 	if (SortDomain.nval >= SortDomain.max) { /* growing....*/
+-		u = (int *)realloc(SortDomain.allusers,
+-				(NVGROW * SortDomain.max) * sizeof(int *));
++		u = realloc(SortDomain.allusers,
++				(NVGROW * SortDomain.max) * sizeof(user**));
+ 		if (u == NULL)
+ 			return -1;
+ 		SortDomain.max *= NVGROW;
+ 		SortDomain.allusers = u;
+ 	}
+-	SortDomain.allusers[SortDomain.nval] = (int)usr;
++	SortDomain.allusers[SortDomain.nval] = usr;
+ 	return SortDomain.nval++;
+ }
+ 
+ 
+ void sortDomainUsersFrom(char *domain) 
+ {
+-	int tmpnval, i, j, max, tmp;
++	int tmpnval, i, j, max;
+ 	struct domain *domainptr;
+ 	struct user *sym;
+ 	struct user *tmp1, *tmp2;
++	user* tmp;
+ 
+ 	tmpnval = -1;
+ 	for (i = 0; i < DomainsTab.nval; i++) 
+@@ -233,10 +234,11 @@
+ 
+ void sortDomainUsersTo(char *domain) 
+ {
+-	int tmpnval, i, j, max, tmp;
++	int tmpnval, i, j, max;
+ 	struct domain *domainptr;
+ 	struct user *sym;
+ 	struct user *tmp1, *tmp2;
++	user* tmp;
+ 
+ 	tmpnval = -1;
+ 	for (i = 0; i < DomainsTab.nval; i++) 
+@@ -268,10 +270,11 @@
+ 
+ void sortDomainUsersTotal(char *domain) 
+ {
+-	int tmpnval, i, j, max, tmp;
++	int tmpnval, i, j, max;
+ 	struct domain *domainptr;
+ 	struct user *sym;
+ 	struct user *tmp1, *tmp2;
++	user * tmp;
+ 
+ 	tmpnval = -1;
+ 	for (i = 0; i < DomainsTab.nval; i++) 
+@@ -307,10 +310,11 @@
+ 
+ void sortDomainUsersByte(char *domain) 
+ {
+-	int tmpnval, i, j, max, tmp;
++	int tmpnval, i, j, max;
+ 	struct domain *domainptr;
+ 	struct user *sym;
+ 	struct user *tmp1, *tmp2;
++	user *tmp;
+ 
+ 	tmpnval = -1;
+ 	for (i = 0; i < DomainsTab.nval; i++) 
+@@ -345,7 +349,7 @@
+ {
+ 	int i, j, max;
+ 	globuser *sym;
+-	int tmp;
++	user *tmp;
+ 	user *tmp1;
+ 	user *tmp2;
+ 
+@@ -373,7 +377,7 @@
+ {
+ 	int i, j, max;
+ 	globuser *sym;
+-	int tmp;
++	user *tmp;
+ 	user *tmp1;
+ 	user *tmp2;
+ 
+@@ -402,7 +406,7 @@
+ {
+ 	int i, j, max;
+ 	globuser *sym;
+-	int tmp;
++	user *tmp;
+ 	user *tmp1;
+ 	user *tmp2;
+ 
+@@ -430,7 +434,7 @@
+ {
+ 	int i, j, max;
+ 	globuser *sym;
+-	int tmp;
++	user *tmp;
+ 	user *tmp1;
+ 	user *tmp2;
+ 
diff --git a/mail/isoqlog/files/patch-Data.h b/mail/isoqlog/files/patch-Data.h
new file mode 100644
index 000000000000..a0c0b5ddcebb
--- /dev/null
+++ b/mail/isoqlog/files/patch-Data.h
@@ -0,0 +1,20 @@
+--- isoqlog/Data.h.orig	2010-08-09 16:53:36.000000000 +0200
++++ isoqlog/Data.h	2010-08-09 16:53:40.000000000 +0200
+@@ -99,7 +99,7 @@
+ struct UsersTab {
+ 	int nval;
+ 	int max;
+-	int *allusers;
++	user**allusers;
+ } UsersTab;
+ 
+ 
+@@ -107,7 +107,7 @@
+ struct SortDomain {
+ 	int nval;
+ 	int max;
+-	int *allusers;
++	user**allusers;
+ } SortDomain;
+ 	
+ #endif